Added basic scoring. Needs bug fixes