Finished going through chapter1, may need further checks and smoothing over inconsistencies between this and other work