Finished implementing drawing methods