adding custom locations now works
lots of really good changes