first commit for rest of the stuff