More work on adding activities. It's broken, but I'm not sure why yet.