Basic DAO functionality
done
Merge