I am not completely certain the static map is needed. Thoughts? See my other comment.