Refactored LOTS of stuff