added places api, etc.
merge from second_merge