commiting some things
forgot some things