Started wiring up tab switching, still lots of bugs
Merge remote-tracking branch 'origin/master'