Initial work for rspec-system 2

Signed-off-by: Ken Barber <ken@bob.sh>