tried to implent some things that i learned today on branch