Reorg of code, created populate script.