Added versions back to 5.0.0
Mostly formatting and code cleaning updates
Made a class, some other guff, send better commit messages...