settlement controller and tests
add new files