Add challenge functionality
Minor bug fixes
Added chellenge dispatch methods