Much better spec coverage

Working towards release