the 30 seconds ;)
Merge branch 'front' into rmetzger_preview