Axis working

must still fix when there's no mapping available (maybe add an interface to do just that?)