Added rudimentary scoring, needs more work before production