Initial commit
Remove core duplication in light of recent commits to trunk.
Make things work better
Proper headers now
Add a metabox, bring the whole room together.