More Models

Started making the changes to the architecture I discussed earlier. Most of the structural components are now present, at least at the blocking level. Planning to still make more adjustments.