diff --git a/squarenotsquare/src/libs/Random.js b/squarenotsquare/src/libs/Random.js
index 9da374b..0123815 100644
--- a/squarenotsquare/src/libs/Random.js
+++ b/squarenotsquare/src/libs/Random.js
@@ -21,14 +21,19 @@ export function generateKey() {
   return result.join('');
 }
 
-export function generateSquareChallenge(){
+export function genSquareChallenge(){
   let result = [];
   let uintArray = new Uint8Array(20);
-  let newChallenge = crypto.getRandomValues(uintArray);
+  let squares = crypto.getRandomValues(uintArray);
+  let shapes = crypto.getRandomValues(uintArray);
 
   for(let i = 0; i < 20; ++i){
-    let position = newChallenge[i] % 2;
-    result.push(position);
+    let squarePos = squares[i] % 2;
+    let shapeType = shapes[i] % 6;
+    result.push({
+      squarePos: squarePos,
+      shapeType: shapeType
+    });
   }
 
   return result;