Refactoring + About to refactor functional code to have class as
wrappers not seperately written functions