just enough to get something showing, plus adding a couple tests.