first commit some still to finish