Huge update. Beginning of re-architecting. Created serveral new
packages. Reworked the data model. Commented out lots of stuff until I
can get it working again.