Add call to run method
Add random generator for shapes