Jon, let's get started

@jonflaire can you update this pull request?