merging in and modifying new-ui branch