Grammar working

more tests wouldn't hurt though