Go2o: Refactoring, cleaning up. WIP.