Tabs and fragments working

Merging caseys work