Have something working, and start to write some tests to benchmark it