fast forwarding through a bunch of stuff
some quick updates on things
controller DRY updates