Working on fixing drawer population