sprites added, 98% finished
merge