Some initial updates to pyramid2.  Still needs work.