Merged Controller

I merged my work in the Controller class with Claytons as well as added
comments and regions