Edit issue #3

Close issue.
Create issue #4
Create issue #5
Create issue #6
Create issue #7