Language feature working. Ready to be merged. There may be comments to
improve and JUnit tests could certainly be better.