First commit; seems to work with my tests as well as the test data
provided.
remove empty imports