updates and improvements; need to move to a more formal architecture for model --> dart translation