updated drawing method; everything up to @implementation