Added glyph collection, need more work