05/01/14

near completion
tidy up commenting etc