Started work on Objectify integration
Update
Update
refactoring
refactoring
refactoring