Added the quick scoring options to scorecard. There is lots of cleanup left even for mvp, so this is an intermediate checkin.