WIP: Bibedit for master