activity logic almost completed. Missing only criteria