finished the oo-skel