in progress (I'll revisit this after NIPS deadline) - View it on GitHub