Added challenge support. Complete challenge does not quite work