merge in JC's work thus far