Significant refactor.

Added methods to return actual entities rather than just cursors.