wanting to get rid of alot of rebundent code