WIP: checkin before fully implementing tab state