finished Feature.. for phase 1