added more yaml settings
refactor into class done!