Forgot about committing again.

More steps toward Version2. UI is just about done-ish, minus tweaks that the other guys want done.

Now, the hard part: sync.