Huge model changes and map now displays locations