VB18 Feature: Marcus

https://veni-vb18.medium.com/week-30-13d6b5b16873