Having broken everything moving things into classes, now I have to make it all work again. Submission now works.

Hopefully viewing will be simpler.