track system/core

just wip, need to revert that later on