Changes that work I think

Certainly doesn't break anything