fixing logic in if statementnts, need to look at classes/objects