Work for review

Everything Ben has been working on, ready for a look. Set a status, leave a comment.