refactored and data population half done