Nearly finished, going through comments on chaps 4 and 1 now