Adding config and code conforming
Changed TODO section
Added test client