Refactored code now starting to work