#982: topic/jsiwek/file-analysis

Ack, I'm planing to go ahead with reviewing anyways asap.