Change project to be full Android again, rewrote unit tests and started working on a recursive implementation of mapping objects