Refactoring. Now using independent DAL.