Added draw and user interaction functions
Resolved merge conflict