finished issue #4. Added in place as well as name. Since they are not always the same thing.