Refactored heavily, all working now