Refactor Complete. Need to fix db<->sample loading
Possibly move db functions to helper class.