started refactor of systems