Project04092019 (needs alot of tweaking) incomplete

Jonno-H