Working on merging Sergei's branch and Keiran's tools