added timestamps to the approved json
refractored and added some tests