New og decc mappings

Ready for Robin to review.