Improve the place-finder and implement the needed core functionalities.