Epic refactoring int progress...