moving stuff around again
move everything into the url mapper