Major dump. Refactoring coming soon ... Ok, probably never