Added controller for modularity/separation of concerns