Lots o changes

Looks like I've made loads of changes...