Re-org, start writing discovery side.