Systems refactoring and WIP