updates, need to re-arrange class members, its a bit spread out from what I intended