Checkpoint
Completed and did some initial testing
Bug fixes and tidyups