Added controller methods to their spots where we are going to use them.