Added places

TODO:
Unit testing for places