Tab overhaul. Some cleanup needed.