Changed some classes to use mData

Rather than passing metadata around, I want to make a central location
where the data is found.