Replaced all datasources with delegates

In response to a new acquired knowledge of when to use delegates and
datasources.