Added some scoring and tracking