modularizes, adds agenda, back-end db processing