Feature/mkt 1

@tgrosshome please merge at your convenience.