Major changes in this commit over include work over several days but that was never...

Benjamin Mako Hill || Want to submit a patch?