Datum box

This file doesn't seem to have datum box related changes in it... and it looks like it's got merge conflict text in it. These files should all be removed from the pull request before we merge it.