Initial merge with posts code.