integrated Aaron and James' files from Friday nights email.
I will merge this branch to master and we should all then be in sync