Massive mayhem
closes #2, almost #14, closes #6, #12