Initial V2

I've changed a bunch of things, but I haven't added a lot of the stuff
we added in phase 2