More add form flesh out, URI handling, etc.