resorted to popping with most of the previous structure intact. ready for a review, @scopatz.