Challenge and performance updates

@rld7 

Please merge this one and delete the other branch that isn't master. It is older.