base implementation in place, testing underway