Commit work in progress including new callback hook and working queries and blocks.