some more progress on gizmo work