Added groups and did a little storying