1 13 cleanup

this actually works now.  (still no tests)