BIt of a restructure / refactor as multiple guest users were being created. Bug now fixed