XML mapping

Checking out using xml mapping instead of (or in addition to)
annotations.