Added some primitives, still need to fix their positions and size..