moving over
moving scoring over
added tests