Need to work on integration and unit tests