Finlay's latest changes

Created this pull request so that I can merge Finlay's changes into my fork.