Whole bunch of changes

Ugh, made the mistake of trying to fix one little thing and went down
the rabbit hole