Finish form refactor - also make scenarios work and fix scenario error message

Error message needs more work, doesn't work well with haltes quite just yet...