commiting everthing - don't remember whats going on here