239 simplify model

This is a biggie, and wraps up most of the Beta aside from refactoring the IDE, which is getting its own milestone (Beta + IDE). Lots of sub-issues closed on this one, and a much better base for moving forward.