tidy Up Move
resolved conflicts from pull, IE i should have pulled before I started working on cleaning up