reorganize models
reorganize models
update summary screen
working.  needs ui and ux help