System Shock

Addresses issue #15