Added a few tests and a TODO. Really.