Pushed to master with a few minor changes. Thanks!