this is really messy right now. the final merge really ought to get some
refactoring done to detangle business logic form representation