Split into multiple files. Added map to results view.