State at Presentation

Everything as it was by presentation… slightly tweaked toolbar, but
most of the changes are commented out.