Drawer refactor

This is the **beginning** of the drawer refactor. Things were pretty messy in there (and still are), but should make a lot more sense now.