Implement shapes

Will not display the triangle though :(