Loads of changes, trying to get this in order.
Renamed file.
Continuing work.