Working point removal
Working drawing over existing plot
Cleanup
Working tests