First upload of v3.0
Everything in v3.0