moved lots of stuff around, got scoring to work.