done with populating logic; test data is still incomplete though