Abrandoned/inproc

pulled against wrong branch :(