Finished neatening up. Ready for stage 2