Adds some nifty drawing stuff - removes some redundant code