Basic contour done!
Troubleshooting, cornercases and refining left