moving more functionality out of CodeRack.