Added map loader mucked about a bit all over