Scenario 2

This is not ready for merge. I just want to get some eyes on it.

@kadst43