Fixed conflicting comment styles. Now onto controller methods