Pull it up as common code immediately. Rename to v1, extract to common with a doxygen marker stubs, add to F2 makefiles.