Updating models to allow for multiple parts of speech
Updating ui to match models