V1 functionality should be complete