Better initialization
Terrible copy-and-paste of activity responses to object
Merge branch '0.2.x'