Added scoring

Added scoring and tests
-- First phase now complete --