Changed args to be a string. Still need to split inside the update function. Find now searches by json properties
Merged Daniel's stuff