Make things much more deterministic

Switched everything to a deterministic version, maybe this will work