That looks very good! I wonder if I can make it fit my file-based approach.

edit: Yeah, doesn't seem like it.