Add random class
Remove old random functions
Update main