Got everything refactored and working!  Time for brite integration...