Added contrast control. Started some totally new geometry\!