ugh, WIP stopping point. deal with this diff.