a744b882ae
Previous attempt got hosed with some merge conflicts, moving to a new branch to start clean
Previous attempt got hosed with some merge conflicts, moving to a new branch to start clean