Solution is generally working.  More testing required