Further repairing, fixing up

Now ready for some testing…
Next steps are to stage the user into the app, simplification/tidying
of the code, and introduction of colour!