first commit- not finished