Added score calculation, updated TODO
Added score calculation, updated TODO