Work in progress

Adding keywords to many symbols.