Follow spec order

Closes #5.