Sync correction

Copied Alex's changes over to Pi and Separated out Merricks stuff.
Complies, but need to take it out for a test flight tomorrow.