Progress, but there is weirdness with the session system...