Oschaaf banjax challenger

@vmon
This needs some work to get it to merge on the staging branch (we also need to add a few things to .gitignore I think), but could you evaluate this?