Pushing my latest changes to git. I believe that the Web UI and CLI should be pretty much ready now.