Super monster refactor!