Dev

closes #9