Added some closure. Closes #4