inelegant way of filtering these out for now
refactor a bit
stuffing this all into a locationmap