Started rewriting my program to be object oriented.
Continued migration to OOP
More testing and tweaking