WIP: More spec stuff.