Re: #1589 - began implementing mock dataset