first draft controller model
Pulling in the changes