Feature/scenarios prototype

Still some weird formatting here.