Tons of refactoring and removing of non-necessary classes
This should be removed once additional refactoring is done - just denotes the call