major Functionality complete Need to add data