Looks good! Closes #8