Un-broke things, changed algorithm significantly