refactor to include go.