Completing v1.0 provisionally, and halfway through writing tests