v1.0

Not ready to be merged