I didn't realize how unclean the seperation between the two was, hopefully Dag's project will clean this up soon.