next commit adding controller functionality