Add drawables for #35 and #36