Adding features back in.

Not a good solution for any of the spec stuff. Grr.