See previous push
 - Implemented drawing of objects and simplified it to a method