merged in Hugh's changes
Merged hugh code. Merged addLayers into script.js