ahhhhh sweet victory

Good changes! Lots of work. Turns out it was all easy!