Some work on lang functionality