Started adding drawing code