WIP: Adding drawer cell types