started refactoring sln