Small changes
Added basic challenges management