Final Commit

This is just things that i hadn't already committed before FMA was
discontinued so here ya all go