Copied design from @fmjansen

Also included group 8 page