Added actual shapes. :boom: :boom: