More work, almost there
Getting much closer, compiles fine but doesn't run tests yet