finish galago refactor