working on new location system
finished location