Add goagent branch for self use