More yaml parsing (WIP)