Rework some things. This could be considered similar to the projectE system.