Adding first commit of fork, with my changes for symlink