It's all refactored and working now