Back to past

Unworking changes commented out for now