This commit closes #1, done.