map filtering and population working — needs cleanup
removing commented code