Add TODOs and a more dire commandment to run rspec