Add a lot more mechanics to the new system.