2nd pass at geometry component

getting there