NOREF: Changing YAML format to arrays
NOREF: Getting caught up with the development branch