move base to allow separate testing