Fix for bullet points 2 and 3 on Issue #8 - solution will be unnecessary if we decide user should be punished for losing connection, could be a way of cheating