Story #4 Done
Fixed #1