initial working version

including yaml class refactoring