Finished 1st draft of controller method