WIP @ monster refactoring :)