removed cruft, redid models to use more inheritance, too much more to track right now