Complete changes. closes #3