Finished up language feature, almost ready to merge