Refactors all code to use OOP techniques
Replaces primary file with OOP modifications
Merge branch 'dev-oop' into dev
Re-adds primary file
Merge branch 'dev-oop' into dev