Initial work on new filename spec