Spec update.
Tests and stuff.