Rearrange some controller methods to make a little bit more sense, maybe