Added support for multiple file types and tightened up error handling. Started writing tests.