Merge pull request #60 from ghing/dev

Merge first pass at baker into main development branch