Not Quite Working

Almost there, need a few more tweaks before it's ready. Commit to allow
easier remote work.