refactored things and daos