Feature/angular scenarios i

This has already been reviewed piecemeal, if someone wants to take a look thats fine, otherwise going to merge in a bit.