Very nice job on splitting these out into separate files.