Working on controller class some more...