Issue 4

Finish Issue 4