Removed random functions, using generator classes later