Steve edits

Parking this here for now. I stripped out all of the controllers so once I get those back in, I'll merge