Closes #26, opens #27