Fully refactored and working