Finished large refactor of all existing systems