Implemented the last of the pending specs