WIP Adding files we care about; TODO: Fix or remove initializers