some more progress (mapping part should work now)