Added intial 0.x implementation