Almost done with drawing tools implementation