I *think* I'm merging stuff from the silshack repository to my repository

This is all in an effort to have an accurate copy of the original database. I think I'm doing this right....