Working on the spec.
More tests...
Should be ready now.