Major Fixes

Create a set of handled files and handling of new types.