Added Objectify and Further Class work