working, but would like to fix DAL.