first commit- still under development