WIP
Various work on the system.  WIP.