Add shapes and stuff