Closes #23; Yay!