really effed up osc work flow somehow
we are up to one rumbler
one rumbles
commiting from mac mini
resolving conflicts