Refactor existing systems to achieve proper grain ()