Lots of tests, and the beginnings of a final app