Moving to guice, checkpoint