added mapper (still VERY dev