Issue: #17

  * Added point checking, added reuse for drawing code for all following operations