Implement JSON wrapping and tidy up DB Obj #4.