changed some naming, and commented out some unused code - maybe later?