Added a load of things - I should really be more definitive with these commit messages.