finished filling in location stuff