Rework the way new systems are created. Rename some things. Pull systems into new file.