remove binary, add random functionality and switch to class methods