Admiral work complete

Accidentally codeformatted an entire file while developing and didnt realize it. If you want me to revert back to original and only make my updates let me know.

Admirals have been implemented, but I didnt do it the same way you did for IOS. if that is a problem let me know and I can trash the work from here and redo it, but I'd rather not. It will all come out when we refactor the object model anyway.