MAV working on testing

Committed the current files to the testing branch.