Change classification choices. Closes #13