added an object to query current values

Test it. Im sure we will need to tweak it.