Starting rewrite
Moving things about
Semi-finished moving everything about
Updated comments