My changes

Might add more tomorrow :) Just for you to review for now. It's a mess!