some progress
Merge branch 'klim-changes'