Updated to actually read files, TODO refactor get-files methods. Macro?
take mine