WIP: adding tabs (cleanup)