Merging citools

In progress