A set of changes to make it work for 0.2

This is a set of changes I made over the last several days.  Things aren't completely working yet, but I thought I might as well put it up here for you guys to take a look.