Updated scoring and added some todo’s