CO-2468 "Baker"

Work in Progress