Halfway through fixing sorting bugginess
Revert sorting to 'working' version to implement demo user
Ability to log in as a guest user
Merge demo-user