15 May 2013 Update of all of Arthur's code

Bringing all of the code up-to-date