Issue 185 - Reinventing hooks and maintaining state server-side (22)