removed some un needed code and took a stab at using objectify