Finished contour, moved all code into package