refactored code

getting ready to add multiple draw objects