General housekeeping. Not tested
Cleaned up a couple of incorrect lines
Need to change the file name now
changed the name
It's broken and I'm going to bed