Just writing some tests; more to come.