updated setup to return an object, 2D Axis
fixed errors from naming