Consolidation

Moved old versions here for archival purposes.