Still working, progress on the mapping (kindof)