Add first attempt at score calculations