File cleanup and consolidation

Boiled all the scattered working versions into one file - no warnings
or errors