shake out engine bugs vs daemon bugs in two passes
# development
r
shake out engine bugs vs daemon bugs in two passes