Added all files to commit, controller update