long commit , everything done so far