refactoreed roll a bit and dealt with the ramifications of that. testing is going well