Started writing some tests, not in a working state yet