refactored the code in a more object oriented fashion
there should be no issue with running the from before
needs testing