First commit
Added proper drawing and actual values