Move this to Core
Fix stuff