Refactored and got next to nothing done!