Fixed the bugs, running nicely, but the drawer state isn't saving.