S2s analysis

more cleanup while doing file analysis....  Trying to reduce dependency on external apis where possible.