Start refactoring shape and number rendering
Stop passing i and j around, set x and y position on card