(Issue 696) WIP; following dao.js