fixing aye/yea bug; making class a bit more atomic
segmenting class from script