dao + facade fix and completed.