Changed files to make a start on a working view - some data passing through but lots of work still to be done \!