Refactored a bunch of crap for universal app version. We've got a long way to go.  Closes #22