adding back old stuff and #7

as requested in the e-mail