Added some base data objects; still needs work.