about to switch to object oriented