Finished (I think) the new default system.