Major refactoring. Everything is broken. :princess: