Added draw criteria feature
Merging
Merging tests
Leaning finshed, code tested