fixed some issues, and created populate class for testing