Decent sized changes.

Finally getting started on the main changes in itself, thanks to someone
on our team learning a bit faster <3