Finish the issue???

closes #1