Merge first pass at baker into main development branch