Started updating to new codegathering libraries