Merge branches 'bmurphy1976-api-layer-get' and 'bmurphy1976-history-bug' into bmurphy1976