Core refactored again, lol.