First pass of new scoring logic

Part of #9
Update changelog