something a lot like what you have described is being added for the steam release :D
whaaat? tell me more
scroll down to challenge mode
or did you mean upgrade wise?