Add contour parsing.
Merge background and processing stuff.
Merge branch 'Morgan'