Added guard, and started to build controller class