Added in some changes to make this actually work.  Getting there.