Started __productionizing__. By which, I mean I have added tests and stuff.