* Big rollup from last night and today's DB work