rebasing the m7 build onto mako L port to try to organize it a bit better