Get the tests passing again and implement Vanik.