Classics

@sherakama plz review and merge
Thats what I thought you would want. This PR reverts it back to the plural only version as it is removing the (s)? part and replacing it with just s. Change it back to the plural optional version and you are GTG.