Added a bunch of optional files do Safi!