Initial work towards making this distributable.