Tidying up.
Adding forgotten files
resolved merge issues with work PC