rewrite

lazy copy/paste from vds05 to quickly archive what changed. I believe this is now working.