Final version

Had to revert all changes, cant get this to work on android at all