Midway through getting the source/original thing working

- mhoye