TODO overhaul
tab_storage slightly prettified