Making things look more like the suggested pattern. Adding mode users stuff to play with