Shobiz: Started TDD based rewrite