Rewiring

Fixing up variable names and I can run at least an empty GenerateAggregate() without any errors. Next step is to wire up the DB adapter.