Added some prelim mapper stuff