All the tests pass, sort of, with various commented out. Real work starts now.