Moving Mathura's work into the main project