added mapping, almost done with lowmessing