Merge pull request #1 from mattseburn/feature-bobcat-123

Feature bobcat 123
bobcat-386
missing stuff for bobcat-386
Merge pull request #2 from mattseburn/feature-bobcat-386

Feature bobcat 386
addition for bobcat-123