committing a bunch of good stuff to the SimplerUI branch