Started to add a map loader