Add new mapping

First step, I reverted back the mapping.

@Ocramius , does the mapping make sense to you before I go any further?