Adding another file.
A bunch of changes for bug #123