untested progress

sleeeeeep blargh.