move some gcpinbal / aquarium code around for later refactoring (nw)