updated after major restructure and change to challenge/activity domain
model