Placeholder views & part of the DataSource class

Look for TODO markup