added yaml integration; cleanup needed