Refactor stuff, add more stuff