V1/Agent refactor WIP