Restructuring models

Reworked model structure to be decidedly more sane & versatile. Plus some other stuff!