Cleaning up repo
ES-152 with tests