More work implementing activities