now the mapp is more or less working