Enh: improved bookkeeping controller (not completed)