Debugged the simulation - need to verify against drawing to see if it's correct, and then generate some plots and send to Peter