v1.2 user stories 296, 234, 262, 273, 270, 269, 244, 2288