Finished refactoring to remove all Android specific stuff. Time to properly test it