Wrapping up first draft; need to bug bash it.