Major work on android version, usong GreenDAO now