Changed structure such that will be sending everything in an object
rather than separate things.