Merged nikhil-rafica

merged Rafica’s changes
drawer working - most updated