updates ui and models
progress on tests so far