Started work on com/sys refactor