Recovery

Recovering some deleted code; some features may be broken.