Justus Piater - 2009-04-10

Follow the SVS example; this should be relatively clean now.