Added some controller logic, continue to add it.