diff --git a/Account Management System - AMS.txt b/Account Management System - AMS.txt
index dc0fd55..b003701 100644
--- a/Account Management System - AMS.txt	
+++ b/Account Management System - AMS.txt	
@@ -36,11 +36,9 @@ th u(NEWCOBJ,Ban Database <BANDB>,bandb,u(cobj,ams),,1,WIZARD SAFE,SIDEFX SAFE)
 
 &INC`ACCOUNT`ACTIVE [u(cobj,ams)]=th u(setq,listing,sortkey(#lambda/lmath(min,iter(get(u(adb)/\%0),if(isobjid(\%i0),if(lte(sub(secs(),convtime(get(\%i0/LAST))),mul(60,60,24,30)),csecs(\%i0))))),filterbool(#lambda/lmath(max,iter(get(u(adb)/\%0),if(isobjid(\%i0),if(lte(sub(secs(),convtime(get(\%i0/LAST))),mul(60,60,24,30)),1)))),u(lattr,u(adb)/*)),n));@attach %!/INC`ACCOUNT`LIST
 
-&FUN`ACCOUNT`CHARLINE [u(cobj,ams)]=align(-6 3 -2 -2 -4 22 -4 21 6,num(%0),switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEM,WIZTAG),WIZ),hasflag(%0,ROYALTY),ansi(u(game_config,SYSTEM,ROYTAG),ROY),u(isadmin,%0),ansi(hy,ADM),haspower(%0,BUILDER),ansi(hm,BUI),u(isapproved,%0),ansi(hg,APP),ansi(hr,---)),default(%0/D`ALTS,0),default(%0/D`ALTS`PRIORITY,0),default(%0/D`FINGER`TYPE,??),u(pueblize,u(moniker,%0),+finger [name(%0)]),elements(maildstats(%0),5),u(pueblize,get(%0/LASTIP),+ip [name(%0)]),u(lastidle,%0))
+&FUN`ACCOUNT`CHARLINE [u(cobj,ams)]=align(-6 3 -2 -3 -4 21 -4 21 6,num(%0),switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEM,WIZTAG),WIZ),hasflag(%0,ROYALTY),ansi(u(game_config,SYSTEM,ROYTAG),ROY),u(isadmin,%0),ansi(hy,ADM),haspower(%0,BUILDER),ansi(hm,BUI),u(isapproved,%0),ansi(hg,APP),ansi(hr,---)),default(%0/D`ALTS,0),u(getproperty,%0,MAJORABBR),default(%0/D`FINGER`TYPE,??),u(pueblize,u(moniker,%0),+finger [name(%0)]),elements(maildstats(%0),5),u(pueblize,get(%0/LASTIP),+ip [name(%0)]),u(lastidle,%0))
 
-
-
-&INC`ACCOUNT`SHOW [u(cobj,ams)]=th u(setq,pcs,u(filter,ISOBJID,get(%q<accid>/CHARACTERS)));@pemit %#=u(HEADER,name(%q<accid>)[if(strlen(u(setr,email,get(%q<accid>/EMAIL))),:%B%q<email>)]);@pemit %#=align(-6 3 2 2 4 22 4 21 6,Dbref,Sta,Al,Pr,Type,Name,Mail,IP,LastOn);@pemit %#=u(SEPARATOR);@dolist/inline %q<pcs>={@pemit %#=u(FUN`ACCOUNT`CHARLINE,##)};@select/inline cand(u(isadmin,%#),gt(words(u(setr,old,u(filter,OLDOBJID,get(%q<accid>/OLD),|,|)),|),0))=1,{@pemit %#=u(SEPARATOR,Old Characters);@pemit %#=align(-6 3 3 21 8 21,Dbref,,,Name,,Objid);@dolist/inline/delimit | [u(SORTOLDID,%q<old>,|,|)]={@pemit %#=align(-6 3 -3 21 8 21,before(##,:),,,after(##,~),,before(##,~))}};@pemit %#=u(HEADER)
+&INC`ACCOUNT`SHOW [u(cobj,ams)]=th u(setq,pcs,u(filter,ISOBJID,get(%q<accid>/CHARACTERS)));@pemit %#=u(HEADER,name(%q<accid>)[if(strlen(u(setr,email,get(%q<accid>/EMAIL))),:%B%q<email>)]);@pemit %#=align(-6 3 2 3 4 21 4 21 6,Dbref,Sta,Al,Fac,Type,Name,Mail,IP,LastOn);@pemit %#=u(SEPARATOR);@dolist/inline %q<pcs>={@pemit %#=u(FUN`ACCOUNT`CHARLINE,##)};@select/inline cand(u(isadmin,%#),gt(words(u(setr,old,u(filter,OLDOBJID,get(%q<accid>/OLD),|,|)),|),0))=1,{@pemit %#=u(SEPARATOR,Old Characters);@pemit %#=align(-6 3 3 21 8 21,Dbref,,,Name,,Objid);@dolist/inline/delimit | [u(SORTOLDID,%q<old>,|,|)]={@pemit %#=align(-6 3 -3 21 8 21,before(##,:),,,after(##,~),,before(##,~))}};@pemit %#=u(HEADER)
 
 &INC`ACCOUNT`MAKENEW [u(cobj,ams)]=th u(setq,nextid,add(1,u(lmax,iter(children(u(cobj,accounts)),last(name(%i0))))));@attach %!/INC`ACCOUNT`MAKENUM=%q<nextid>
 &INC`ACCOUNT`MAKENUM [u(cobj,ams)]=@tel [u(setr,accid,create(Account [abs(%0)]))]=[u(cobj,accounts)];@parent %q<accid>=[u(cobj,accounts)]
diff --git a/CORE 01 - Master Code Object - MCO.txt b/CORE 01 - Master Code Object - MCO.txt
index cd09b17..1eb7f19 100644
--- a/CORE 01 - Master Code Object - MCO.txt	
+++ b/CORE 01 - Master Code Object - MCO.txt	
@@ -362,25 +362,70 @@ th if(isdbref(u(cobj,mco)),,setq(0,create(Master Code Object <MCO>))[tel(%q0,swi
 &GETPROPERTY`ACCEMAIL [u(cobj,mco)]=if(isdbref(u(accid,%0)),get(u(accid,%0)/EMAIL))
 &GETPROPERTY`ACCALTS [u(cobj,mco)]=if(isdbref(u(cobj,ams)),u(u(cobj,ams)/FUN`ALTS`LIST,%0))
 
-&GETPROPERTY`GROUPS [u(cobj,mco)]=u(sortgroups,u(sortname,setinter(get(%0/D`GROUPS),u(u(cobj,gms)/FUN`LISTGROUPS))))
-&GETPROPERTY`GTITLE [u(cobj,mco)]=get(%0/D`GROUP`[u(namegrab,u(GETPROPERTY`GROUPS,%0,%1,%2),%1)]`TITLE)
-&GETPROPERTY`FACTIONDB [u(cobj,mco)]=first(u(GETPROPERTY`FACTIONSDB,%0,%1,%2,%3))
-&GETPROPERTY`FACTIONCOLOR [u(cobj,mco)]=if(isdbref(u(setr,fac,u(GETPROPERTY`FACTIONDB,%0,%1,%2,%3))),u(u(cobj,gms)/FUN`GETSET,%q<fac>,COLOR),hx)
-&GETPROPERTY`FACTIONSDB [u(cobj,mco)]=u(filter,FACTIONS,u(GETPROPERTY`GROUPS,%0,%1,%2,%3))
-&GETPROPERTY`FACTION [u(cobj,mco)]=if(isdbref(u(setr,fac,u(GETPROPERTY`FACTIONDB,%0,%1,%2,%3))),u(GETPROPERTY`GROUPNAMES,%0,%1,%q<fac>,%3))
-&GETPROPERTY`FACABBR [u(cobj,mco)]=switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEm,WIZTAG),WIZ),u(isadmin,%0),ansi(u(game_config,SYSTEm,ROYTAG),ROY),if(isdbref(u(setr,fac,u(GETPROPERTY`FACTIONDB,%0,%1,%2,%3))),ansi(u(strfirstof,u(color,%#,GROUP,%q<fac>,,1),get(%q<fac>/SET`COLOR),n),get(%q<fac>/SET`ABBREVIATION))))
-&GETPROPERTY`FACABBRS [u(cobj,mco)]=switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEm,WIZTAG),WIZ),u(isadmin,%0),ansi(u(game_config,SYSTEm,ROYTAG),ROY),if(words(u(setr,facs,u(GETPROPERTY`FACTIONSDB,%0,%1,%2,%3))),iter(%q<facs>,ansi(u(strfirstof,u(color,%#,GROUP,%i0,,1),get(%i0/SET`COLOR),n),get(%i0/SET`ABBREVIATION)),%b,|)))
-&GETPROPERTY`FACLETTER [u(cobj,mco)]=switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEm,WIZTAG),WIZ),u(isadmin,%0),ansi(u(game_config,SYSTEm,ROYTAG),ROY),if(isdbref(u(setr,fac,u(GETPROPERTY`FACTIONDB,%0,%1,%2,%3))),ansi(u(strfirstof,u(color,%#,GROUP,%q<fac>,,1),get(%q<fac>/SET`COLOR),n),u(strfirstof,get(%q<fac>/SET`LETTER),left(get(%q<fac>/SET`ABBREVIATION),1)))))
-&GETPROPERTY`FACTIONS [u(cobj,mco)]=if(words(u(setr,fac,u(GETPROPERTY`FACTIONSDB,%0,%1,%2,%3))),u(GETPROPERTY`GROUPNAMES,%0,%1,%q<fac>,%3))
-&GETPROPERTY`RANK [u(cobj,mco)]=if(isdbref(u(setr,fac,u(GETPROPERTY`FACTIONDB,%0,%1,%2,%3))),u(GETPROPERTY`RANKS,%0,%1,%q<fac>,%3))
-&GETPROPERTY`RANKS [u(cobj,mco)]=edit(iter(u(strfirstof,%2,u(GETPROPERTY`FACTIONSDB,%0,%1,%2,%3)),u(setr,rank,get(%0/D`GROUP`%i0`RANK))-[u(strfirstof,get(%0/D`GROUP`%i0`TITLE),get(%i0/RANK`%q<rank>`NAME))],%b,|),|,if(%3,%r,\,%b))
-&GETPROPERTY`GROUPNAMES [u(cobj,mco)]=edit(iter(u(strfirstof,%2,u(sortname,setdiff(u(GETPROPERTY`GROUPS,%0,%1,%2,%3),u(GETPROPERTY`FACTIONSDB,%0,%1,%2,%3)))),if(%1,u(pueblize,ansi(u(strfirstof,get(%i0/SET`COLOR),n),name(%i0)),+group [name(%i0)]),ansi(u(strfirstof,get(%i0/SET`COLOR),n),name(%i0))),%b,|),|,if(%3,%r,\,%b))
+&GETPROPERTY`GROUPS [u(cobj,mco)]=localize(default(%0/D`CACHE`GROUPS,u(setr,cache,u(sortgroups,u(sortname,setinter(get(%0/D`GROUPS),u(u(cobj,gms)/FUN`LISTGROUPS)))))[u(attrib_set,%0,D`CACHE`GROUPS,%q<cache>)]))
+
+&GETPROPERTY`MAJORDBS [u(cobj,mco)]=localize(default(%0/D`CACHE`MAJORDBS,u(setr,cache,u(sortgroups,u(sortname,u(filter,MAJOR,u(GETPROPERTY`GROUPS,%0)))))[u(attrib_set,%0,D`CACHE`MAJORDBS,%q<cache>)]))
+&GETPROPERTY`MAJORDB [u(cobj,mco)]=first(u(GETPROPERTY`MAJORDBS,%0))
+&GETPROPERTY`MINORDBS [u(cobj,mco)]=localize(default(%0/D`CACHE`MINORDBS,u(setr,cache,u(sortgroups,u(sortname,u(filter,MINOR,u(GETPROPERTY`GROUPS,%0)))))[u(attrib_set,%0,D`CACHE`MINORDBS,%q<cache>)]))
+&GETPROPERTY`MINORDB [u(cobj,mco)]=first(u(GETPROPERTY`MINORDBS,%0))
+&GETPROPERTY`FIRSTDB [u(cobj,mco)]=u(strfirstof,u(GETPROPERTY`MAJORDB,%0),u(GETPROPERTY`MINORDB,%0))
+
+&GETPROPERTY`GROUPNAME [u(cobj,mco)]=localize(u(setq,gname,ansi(u(GETPROPERTY`GROUPCOLOR,%0),u(moniker,%0)))[if(%1,u(pueblize,%q<gname>,+group [name(%0)]),%q<gname>)])
+&GETPROPERTY`GROUPCOLOR [u(cobj,mco)]=u(strfirstof,u(color,%#,GROUP,%0,,1),get(%0/SET`COLOR),n)
+&GETPROPERTY`GROUPABBR [u(cobj,mco)]=ansi(u(GETPROPERTY`GROUPCOLOR,%0),default(%0/SET`ABBREVIATION,left(name(%0),3)))
+&GETPROPERTY`GROUPLETTER [u(cobj,mco)]=ansi(u(GETPROPERTY`GROUPCOLOR,%0),default(%0/SET`LETTER,u(strfirstof,left(get(%0/SET`ABBREVIATION),1),left(name(%0),1))))
+
+&GETPROPERTY`RANK [u(cobj,mco)]=localize(u(setr,rank,get(%0/D`GROUP`%1`RANK))-[u(strfirstof,get(%0/D`GROUP`%1`TITLE),get(%1/RANK`%q<rank>`NAME))])
+
+&GETPROPERTY`MAJORNAME [u(cobj,mco)]=localize(if(isdbref(u(setr,fac,u(GETPROPERTY`MAJORDB,%0))),u(GETPROPERTY`GROUPNAME,%q<fac>,%1)))
+&GETPROPERTY`MAJORNAMECLICK [u(cobj,mco)]=u(GETPROPERTY`MAJORNAME,%0,1)
+&GETPROPERTY`MAJORABBR [u(cobj,mco)]=localize(switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEM,WIZTAG),WIZ),u(isadmin,%0),ansi(u(game_config,SYSTEM,ROYTAG),ROY),if(isdbref(u(setr,fac,u(GETPROPERTY`MAJORDB,%0))),u(GETPROPERTY`GROUPABBR,%q<fac>))))
+&GETPROPERTY`MAJORLETTER [u(cobj,mco)]=localize(switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEm,WIZTAG),W),u(isadmin,%0),ansi(u(game_config,SYSTEM,ROYTAG),R),if(isdbref(u(setr,fac,u(GETPROPERTY`MAJORDB,%0))),u(GETPROPERTY`GROUPLETTER,%q<fac>))))
+&GETPROPERTY`MAJORRANK [u(cobj,mco)]=localize(if(isdbref(u(setr,fac,u(GETPROPERTY`MAJORDB,%0))),u(GETPROPERTY`RANK,%0,%q<fac>)))
+&GETPROPERTY`MAJORNAMELIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`MAJORDBS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`GROUPNAME,%i0,%1),%b,beep()),beep(),if(%2,%R,\,%b))))
+&GETPROPERTY`MAJORNAMELISTLINE [u(cobj,mco)]=u(GETPROPERTY`MAJORNAMELIST,%0,0,1)
+&GETPROPERTY`MAJORNAMELISTCLICK [u(cobj,mco)]=u(GETPROPERTY`MAJORNAMELIST,%0,1,0)
+&GETPROPERTY`MAJORNAMELISTLINECLICK [u(cobj,mco)]=u(GETPROPERTY`MAJORNAMELIST,%0,1,1)
+&GETPROPERTY`MAJORRANKLIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`MAJORDBS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`RANK,%0,%i0),%b,beep()),beep(),if(%1,%R,\,%b))))
+&GETPROPERTY`MAJORRANKLISTLINE [u(cobj,mco)]=u(GETPROPERTY`MAJORRANKLIST,%0,1)
+
+&GETPROPERTY`MINORNAME [u(cobj,mco)]=localize(if(isdbref(u(setr,fac,u(GETPROPERTY`MINORDB,%0))),u(GETPROPERTY`GROUPNAME,%q<fac>,%1)))
+&GETPROPERTY`MINORNAMECLICK [u(cobj,mco)]=u(GETPROPERTY`MINORNAME,%0,1)
+&GETPROPERTY`MINORABBR [u(cobj,mco)]=localize(switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEM,WIZTAG),WIZ),u(isadmin,%0),ansi(u(game_config,SYSTEM,ROYTAG),ROY),if(isdbref(u(setr,fac,u(GETPROPERTY`MINORDB,%0))),u(GETPROPERTY`GROUPABBR,%q<fac>))))
+&GETPROPERTY`MINORLETTER [u(cobj,mco)]=localize(switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEm,WIZTAG),W),u(isadmin,%0),ansi(u(game_config,SYSTEM,ROYTAG),R),if(isdbref(u(setr,fac,u(GETPROPERTY`MINORDB,%0))),u(GETPROPERTY`GROUPLETTER,%q<fac>))))
+&GETPROPERTY`MINORRANK [u(cobj,mco)]=localize(if(isdbref(u(setr,fac,u(GETPROPERTY`MINORDB,%0))),u(GETPROPERTY`RANK,%0,%q<fac>)))
+&GETPROPERTY`MINORNAMELIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`MINORDBS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`GROUPNAME,%i0,%1),%b,beep()),beep(),if(%2,%R,\,%b))))
+&GETPROPERTY`MINORNAMELISTLINE [u(cobj,mco)]=u(GETPROPERTY`MINORNAMELIST,%0,0,1)
+&GETPROPERTY`MINORNAMELISTCLICK [u(cobj,mco)]=u(GETPROPERTY`MINORNAMELIST,%0,1,0)
+&GETPROPERTY`MINORNAMELISTLINECLICK [u(cobj,mco)]=u(GETPROPERTY`MINORNAMELIST,%0,1,1)
+&GETPROPERTY`MINORRANKLIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`MINORDBS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`RANK,%0,%i0),%b,beep()),beep(),if(%1,%R,\,%b))))
+&GETPROPERTY`MINORRANKLISTLINE [u(cobj,mco)]=u(GETPROPERTY`MINORRANKLIST,%0,1)
+
+&GETPROPERTY`FIRSTNAME [u(cobj,mco)]=localize(if(isdbref(u(setr,fac,u(GETPROPERTY`FIRSTDB,%0))),u(GETPROPERTY`GROUPNAME,%q<fac>,%1)))
+&GETPROPERTY`FIRSTNAMECLICK [u(cobj,mco)]=u(GETPROPERTY`FIRSTNAME,%0,1)
+&GETPROPERTY`FIRSTABBR [u(cobj,mco)]=localize(switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEM,WIZTAG),WIZ),u(isadmin,%0),ansi(u(game_config,SYSTEM,ROYTAG),ROY),if(isdbref(u(setr,fac,u(GETPROPERTY`FIRSTDB,%0))),u(GETPROPERTY`GROUPABBR,%q<fac>))))
+&GETPROPERTY`FIRSTLETTER [u(cobj,mco)]=localize(switch(1,u(iswizard,%0),ansi(u(game_config,SYSTEm,WIZTAG),W),u(isadmin,%0),ansi(u(game_config,SYSTEM,ROYTAG),R),if(isdbref(u(setr,fac,u(GETPROPERTY`FIRSTDB,%0))),u(GETPROPERTY`GROUPLETTER,%q<fac>))))
+&GETPROPERTY`FIRSTRANK [u(cobj,mco)]=localize(if(isdbref(u(setr,fac,u(GETPROPERTY`FIRSTDB,%0))),u(GETPROPERTY`RANK,%0,%q<fac>)))
+&GETPROPERTY`FIRSTNAMELIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`FIRSTDBS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`GROUPNAME,%i0,%1),%b,beep()),beep(),if(%2,%R,\,%b))))
+&GETPROPERTY`FIRSTNAMELISTLINE [u(cobj,mco)]=u(GETPROPERTY`FIRSTNAMELIST,%0,0,1)
+&GETPROPERTY`FIRSTNAMELISTCLICK [u(cobj,mco)]=u(GETPROPERTY`FIRSTNAMELIST,%0,1,0)
+&GETPROPERTY`FIRSTNAMELISTLINECLICK [u(cobj,mco)]=u(GETPROPERTY`FIRSTNAMELIST,%0,1,1)
+&GETPROPERTY`FIRSTRANKLIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`FIRSTDBS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`RANK,%0,%i0),%b,beep()),beep(),if(%1,%R,\,%b))))
+&GETPROPERTY`FIRSTRANKLISTLINE [u(cobj,mco)]=u(GETPROPERTY`FIRSTRANKLIST,%0,1)
+
+&GETPROPERTY`ALLNAMELIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`GROUPS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`GROUPNAME,%i0,%1),%b,beep()),beep(),if(%2,%R,\,%b))))
+&GETPROPERTY`ALLNAMELISTLINE [u(cobj,mco)]=u(GETPROPERTY`ALLNAMELIST,%0,0,1)
+&GETPROPERTY`ALLNAMELISTCLICK [u(cobj,mco)]=u(GETPROPERTY`ALLNAMELIST,%0,1,0)
+&GETPROPERTY`ALLNAMELISTLINECLICK [u(cobj,mco)]=u(GETPROPERTY`ALLNAMELIST,%0,1,1)
+&GETPROPERTY`ALLRANKLIST [u(cobj,mco)]=localize(if(words(u(setr,facs,u(GETPROPERTY`GROUPS,%0))),edit(iter(%q<facs>,u(GETPROPERTY`RANK,%0,%i0),%b,beep()),beep(),if(%1,%R,\,%b))))
+&GETPROPERTY`ALLRANKLISTLINE [u(cobj,mco)]=u(GETPROPERTY`ALLRANKLIST,%0,1)
 
 &SORTGROUPS [u(cobj,mco)]=u(SORTGROUPS`[v(game)],%0,if(strlen(%1),%1,%B),if(strlen(%2),%2,%B))
 &SORTGROUPS`PENNMUSH [u(cobj,mco)]=sort(%0,attr:SET`SORT,%1,%2)
 &SORTGROUPS`RHOSTMUSH [u(cobj,mco)]=sortby(#lambda/[lit([ncomp(default(%0/SET`SORT,99),default(%1/SET`SORT,99))])],%0,%1,%2)
 
-&FIL`FACTIONS [u(cobj,mco)]=t(u(u(cobj,gms)/FUN`GETSET,%0,MAJOR))
+&FIL`MAJOR [u(cobj,mco)]=t(u(u(cobj,gms)/FUN`GETSET,%0,MAJOR))
+&FIL`MINOR [u(cobj,mco)]=not(u(u(cobj,gms)/FUN`GETSET,%0,MAJOR))
 
 @@ cand(u(u(cobj,gms)/FUN`GETSET,%0,MAJOR),strmatch(FACTION,u(u(cobj,gms)/FUN`GETSET,%0,TYPE)))
 &FIL`MAJORGROUPS [u(cobj,mco)]=u(u(cobj,gms)/FUN`GETSET,%0,MAJOR)
diff --git a/CORE 03 - Game Configuration System - GCS.txt b/CORE 03 - Game Configuration System - GCS.txt
index 89a5bd7..bb024d6 100644
--- a/CORE 03 - Game Configuration System - GCS.txt	
+++ b/CORE 03 - Game Configuration System - GCS.txt	
@@ -26,7 +26,7 @@ th u(NEWCOBJ,Game Configuration Data Storage <CONFIG>,config,u(cobj,gcs),,1,WIZA
 
 &FUN`SETTINGS [u(cobj,gcs)]=sort(get(u(cobj,config)/CATEGORIES`%0),|,|)
 
-&INC`GET [u(cobj,gcs)]=@check strlen(%0)=@attach %!/INC`MSG={ERROR: Category field empty.};@attach %!/INC`PARTIAL=%0,u(FUN`CATEGORIES),|,category,category;@check strlen(%1)=@attach %!/INC`MSG={ERROR: Option field empty.};@attach %!/INC`PARTIAL=%1,u(FUN`SETTINGS,%q<category>),|,option,option;@pemit %#=u(game_config,%q<category>,%q<option>)
+&INC`GET [u(cobj,gcs)]=@check strlen(%0)=@attach %!/INC`MSG={ERROR: Category field empty.};@attach %!/INC`PARTIAL=%0,u(FUN`CATEGORIES),|,category,category;@check strlen(%1)=@attach %!/INC`MSG={ERROR: Option field empty.};@attach %!/INC`PARTIAL=%1,u(FUN`SETTINGS,%q<category>),|,option,option;@pemit %#=u(decompose,u(game_config,%q<category>,%q<option>))
 
 &INC`SET [u(cobj,gcs)]=@check u(iswizard,%#)=@attach %!/INC`MSG=ERROR: Permission denied. Only wizards can set options.;@check strlen(%0)=@attach %!/INC`MSG={ERROR: Category field empty.};@attach %!/INC`PARTIAL=%0,u(FUN`CATEGORIES),|,category,category;@check strlen(%1)=@attach %!/INC`MSG={ERROR: Option field empty.};@attach %!/INC`PARTIAL=%1,u(FUN`SETTINGS,%q<category>),|,option,option;@switch/inline strlen(%2)=0,{@attach %!/INC`MSG=Cleared/reset %q<category> %q<option>!;@attach %!/WIPE=u(cobj,config),CONFIG`%q<category>`%q<option>;@attach %!/INC`MSG`CHAN={Cleared/Reset %q<category> %q<option>}},{@attach %!/INC`VALID`[default(u(cobj,config)/TYPE`%q<category>`%q<option>,WORD)]=%2;th u(attrib_set,u(cobj,config),CONFIG`%q<category>`%q<option>,%q<value>);@attach %!/INC`MSG=u(setr,msg,Game Option %q<category> %q<option> Set to: %q<value>);@attach %!/INC`MSG`CHAN={%q<msg>}}
 
diff --git a/FCList Management System - FCLIST.txt b/FCList Management System - FCLIST.txt
index 61b9fd3..d7a9d8f 100644
--- a/FCList Management System - FCLIST.txt	
+++ b/FCList Management System - FCLIST.txt	
@@ -19,7 +19,7 @@ th u(NEWCOBJ,FCList Database <FCLIST-DB>,fclist-db,u(cobj,fclist),,1,WIZARD SAFE
 
 &INC`LISTALL [u(cobj,fclist)]=@pemit %#=u(HEADER,mudname()'s Themes);@pemit %#=u(table,iter(u(sortattr,lattr(u(cobj,fclist-db)/F`*)),pueblize(get(u(cobj,fclist-db)/%i0),%q<com> [get(u(cobj,fclist-db)/%i0)]),%b,|),26,u(width,%#),|);@pemit %#=u(SUBHEADER,%q<com> <group> for listing - %q<com>/info <group> for Info)
 
-&INC`LIST [u(cobj,fclist)]=@attach %!/INC`FIND=%0;@pemit %#=u(HEADER,%q<gname> Roster);@pemit %#=ansi(u(color,%#,FCLIST,COLUMN_NAMES),align(23 21 10 9 9,Name,Faction,Last On,Type,Available));@pemit %#=[u(SEPARATOR)];@dolist/inline u(sortname,u(filter,ISOBJID,get(u(cobj,fclist-db)/%q<group>`LIST)))={@pemit %#=align(23 21 10 9 9,u(moniker,##),u(strfirstof,u(getproperty,##,FACTION),Unaffiliated),u(lastidle,##),default(##/D`FINGER`TYPE,FC),u(capnames,default(##/D`FINGER`STATUS,Open)))};@pemit %#=u(SUBHEADER)
+&INC`LIST [u(cobj,fclist)]=@attach %!/INC`FIND=%0;@pemit %#=u(HEADER,%q<gname> Roster);@pemit %#=ansi(u(color,%#,FCLIST,COLUMN_NAMES),align(23 21 10 9 9,Name,Faction,Last On,Type,Available));@pemit %#=[u(SEPARATOR)];@dolist/inline u(sortname,u(filter,ISOBJID,get(u(cobj,fclist-db)/%q<group>`LIST)))={@pemit %#=align(23 21 10 9 9,u(moniker,##),u(strfirstof,u(getproperty,##,MAJORNAMECLICK),Unaffiliated),u(lastidle,##),default(##/D`FINGER`TYPE,FC),u(capnames,default(##/D`FINGER`STATUS,Open)))};@pemit %#=u(SUBHEADER)
 
 &INC`INFO [u(cobj,fclist)]=@attach %!/INC`FIND=%0;@pemit %#=u(HEADER,Theme Info: %q<gname>);@pemit %#=get(u(cobj,fclist-db)/%q<group>`DESC);@pemit %#=u(SUBHEADER)
 
diff --git a/Finger Management System - FINGER.txt b/Finger Management System - FINGER.txt
index 32c8f84..97f42f4 100644
--- a/Finger Management System - FINGER.txt	
+++ b/Finger Management System - FINGER.txt	
@@ -61,4 +61,4 @@ th u(newconf,config,OOCFINGER,ADMINSET,,Sections Admins can edit.,LIST)
 
 +shelp/add +finger=[u(cobj,finger)]/SHLP`FINGER
 +shelp/category +finger=Administration
-&SHLP`FINGER [u(cobj,finger)]=[ansi(hc,Staff Configuration)]%R+finger is one of those commands that's difficult to make a generic version suited for all games. So this one can be customized easily using +gameconfig!%R%RFor FINGER, COLUMN1 and COLUMN2 use a |-delimited list of finger fields that can be customized with adding further options via ~ delimiters. The order for field delimiters is <GET>~<DISPLAY>~<DEFAULT>. As an example, if COLUMN1 is SEX~Gender~???|RACE~Species~Human, the RACE word will be used to GET DATA (using getproperty on the Master Code Object), it will display Species in the column, and if the GET returns nothing it will display Human by default.%R%RThe EXTRA option handles the bordered sections below the dual column section. It works similarly: GROUPNAMES2~Groups|SKILLS~Skills would show sections named Groups and Skills, with GETPROPERTY`GROUPNAMES2 being called for the first one.%R%RIf the system cannot find a GETPROPERTY entry for dynamic retrieval it will instead resort to searching for an attribute on the player: D`FINGER`<GET> such as D`FINGER`PROFILE. This is important because of PLAYERSET and ADMINSET, which allow you to set |-delimited WORDS. PLAYERSET values are entries players can set themselves while ADMINSET can only be changed by admin.%R%RHERE ARE SOME SPECIAL <GET>'s provided by Volund's Mushcode Suite:%RSEX: Retrieves @sex.%RNAME: Retrives name().%RMONIKER: Retrieves @moniker or cname() depending on game.%RALIASNAME: Shows name() then first alias() in parentheses.%RALIASMONIKER: Like above but uses @moniker.%RWIKI: Retrieves D`FINGER`WIKI and tries to clickify it.%RGROUPNAMES2: Shows clickable list of all Minor Group memberships.%RMAIL: Shows # Unread Messages.%RALIAS: Shows first @alias.%RLAST: Display idle or last-connect information.%REMAIL: Shows D`FINGER`EMAIL. If value begins with ! it is considered a hidden email and only admin see it.%RACCEMAIL: Shows Account email. Players probably won't like this one!%RACCALTS: Display the same data that +alts would. Requires Account System.%RFACTION: Displays name of first Major Group the player belongs to according to Group Sort.%RFACABBR: First found faction's abbreviation.%RFACLETTER: First found faction's first letter.%RRANK: #-<rank or title> from first found faction.%R%RYou can add additional GETPROPERTIES by adding them in the following format to the Master Code Object: GETPROPERTY`<GET>, such as GETPROPERTY`PROFILE. The person being checked is passed as \%0. Design these as a u()-function.%R%RA <GET> MUST be a single word. Alphanumeric characters, no spaces or special symbols!%R%RSome examples:%R+gameconfig finger/column1=FACTION~Faction~Unaffiliated|SEX~Gender|SPECIES~Species%R+gameconfig finger/column2=RANK~Rank~N/A|JOB~Job~Wanderer|TYPE~Character Type~N/A%R+gameconfig finger/extra=QUOTE~Quote|PROFILE~Profile|SKILLS~Skills|WIKI~Wiki%R%REXAMPLE of adding a new special <GET>:%R%R&GETPROPERTY`CODENAME [num(u(cobj,mco))]=get(\%0/CODENAME)%R(yes this is the correct dbref.)
\ No newline at end of file
+&SHLP`FINGER [u(cobj,finger)]=[ansi(hc,Staff Configuration)]%R+finger is one of those commands that's difficult to make a generic version suited for all games. So this one can be customized easily using +gameconfig!%R%RFor FINGER, COLUMN1 and COLUMN2 use a |-delimited list of finger fields that can be customized with adding further options via ~ delimiters. The order for field delimiters is <GET>~<DISPLAY>~<DEFAULT>. As an example, if COLUMN1 is SEX~Gender~???|RACE~Species~Human, the RACE word will be used to GET DATA (using getproperty on the Master Code Object), it will display Species in the column, and if the GET returns nothing it will display Human by default.%R%RThe EXTRA option handles the bordered sections below the dual column section. It works similarly: GROUPNAMES2~Groups|SKILLS~Skills would show sections named Groups and Skills, with GETPROPERTY`GROUPNAMES2 being called for the first one.%R%RIf the system cannot find a GETPROPERTY entry for dynamic retrieval it will instead resort to searching for an attribute on the player: D`FINGER`<GET> such as D`FINGER`PROFILE. This is important because of PLAYERSET and ADMINSET, which allow you to set |-delimited WORDS. PLAYERSET values are entries players can set themselves while ADMINSET can only be changed by admin.%R%RHERE ARE SOME SPECIAL <GET>'s provided by Volund's Mushcode Suite:%RSEX: Retrieves @sex.%RNAME: Retrives name().%RMONIKER: Retrieves @moniker or cname() depending on game.%RALIASNAME: Shows name() then first alias() in parentheses.%RALIASMONIKER: Like above but uses @moniker.%RWIKI: Retrieves D`FINGER`WIKI and tries to clickify it.%RGROUPNAMES2: Shows clickable list of all Minor Group memberships.%RMAIL: Shows # Unread Messages.%RALIAS: Shows first @alias.%RLAST: Display idle or last-connect information.%REMAIL: Shows D`FINGER`EMAIL. If value begins with ! it is considered a hidden email and only admin see it.%RACCALTS: Display the same data that +alts would. Requires Account System.%R%RGROUP <GETS>:%RGroup data can be retrieved using some standardized formats. There are three <TYPES> for retrieving group information: MAJOR, MINOR, and FIRST. These attempt to retrieve data from the FIRST FOUND GROUP of the given type (with FIRST being ANY group but preferring Majors) and are identical. Only the LIST functions differ, creating data from ALL groups of the type. The ALL <TYPE> can also be used with LIST functions.%R<TYPE>NAME: Show the colored name of the group.%R<TYPE>NAMECLICK: Show a clickable <TYPE>NAME.%R<TYPE>ABBR: Show colored Abbreviation.%R<TYPE>LETTER: Show colored LETTER, derived from Abbreviation.%R<TYPE>RANK: Show character's rank in Faction-style.%R<TYPE>NAMELIST: Show comma-separated list of groups.%R<TYPE>NAMELISTLINE: Show group names separated by linebreaks.%R<TYPE>NAMELISTCLICK: Shows <TYPE>NAMELIST but clickable.%R<TYPE>NAMELISTLINECLICK: Show <TYPE>NAMELISTLINE but clickable.%R<TYPE>RANKLIST: Show faction-style ranks as comma-separated list.%R<TYPE>RANKLISTLINE: Show faction-style ranks as newline-separated list.%R%RYou can add additional GETPROPERTIES by adding them in the following format to the Master Code Object: GETPROPERTY`<GET>, such as GETPROPERTY`PROFILE. The person being checked is passed as \%0. Design these as a u()-function.%R%RA <GET> MUST be a single word. Alphanumeric characters, no spaces or special symbols!%R%RSome examples:%R+gameconfig finger/column1=FACTION~MAJORNAMECLICK~Unaffiliated|SEX~Gender|SPECIES~Species%R+gameconfig finger/column2=RANK~Rank~N/A|JOB~Job~Wanderer|TYPE~Character Type~N/A%R+gameconfig finger/extra=QUOTE~Quote|PROFILE~Profile|SKILLS~Skills|WIKI~Wiki%R%REXAMPLE of adding a new special <GET>:%R%R&GETPROPERTY`CODENAME [num(u(cobj,mco))]=get(\%0/CODENAME)%R(yes this is the correct dbref.)
\ No newline at end of file
diff --git a/Group Management System - GMS.txt b/Group Management System - GMS.txt
index f1d8974..0cc71ee 100644
--- a/Group Management System - GMS.txt	
+++ b/Group Management System - GMS.txt	
@@ -169,11 +169,11 @@ th u(NEWCOBJ,Group Object Parent <GOP>,gop,u(cobj,gms),,1,WIZARD SAFE,INHERIT SI
 &FIL`MINORGROUPS [u(cobj,gms)]=eq(u(FUN`GETSET,%0,MAJOR),0)
 
 @@ MEMBERSHIP CONTROL
-&INC`CODE`ADDTOGROUP [u(cobj,gms)]=&MEMBERS %0=setunion(get(%0/MEMBERS),u(objid,%1));@attach %!/INC`MSG`NOTICE=%2,%1;&D`GROUPS %1=setunion(get(%1/D`GROUPS),num(%0));th u(attrib_set,%1,D`GROUP`%0`RANK,u(strfirstof,%3,u(FUN`GETSET,%0,STARTRANK),3));&INVITES %0=setdiff(get(%0/INVITES),u(objid,%1))
+&INC`CODE`ADDTOGROUP [u(cobj,gms)]=&MEMBERS %0=setunion(get(%0/MEMBERS),u(objid,%1));@attach %!/INC`MSG`NOTICE=%2,%1;&D`GROUPS %1=setunion(get(%1/D`GROUPS),num(%0));th u(attrib_set,%1,D`GROUP`%0`RANK,u(strfirstof,%3,u(FUN`GETSET,%0,STARTRANK),3));&INVITES %0=setdiff(get(%0/INVITES),u(objid,%1));@attach %!/WIPE=%1,D`CACHE
 
 &INC`CODE`ADDTODIVISION [u(cobj,gms)]=&DIVISION`%4`MEMBERS %0=setunion(get(%0/DIVISION`%1`MEMBERS),u(objid,%1));@attach %!/INC`MSG`NOTICE=%2,%1;th u(attrib_set,%1,D`GROUP`%0`DIVISION`%4`RANK,%#)
 
-&INC`CODE`REMFROMGROUP [u(cobj,gms)]=&MEMBERS %0=setdiff(get(%0/MEMBERS),objid(%1));@attach %!/INC`MSG`NOTICE=%2,%1;th u(delstat,%0,RANK,objid(%1));@attach %!/WIPE=%1,D`GROUP`%0;@dolist/inline u(filter,ISDIVMEMBER,u(lattr,%0/DIVISION`*`MEMBERS),%b,%b,%1,%0)=@attach %!/INC`CODE`REMFROMDIVISION=%0,%1,,,elements(##,2,`);&D`GROUPS %1=setdiff(get(%1/D`GROUPS),num(%0))
+&INC`CODE`REMFROMGROUP [u(cobj,gms)]=&MEMBERS %0=setdiff(get(%0/MEMBERS),objid(%1));@attach %!/INC`MSG`NOTICE=%2,%1;th u(delstat,%0,RANK,objid(%1));@attach %!/WIPE=%1,D`GROUP`%0;@dolist/inline u(filter,ISDIVMEMBER,u(lattr,%0/DIVISION`*`MEMBERS),%b,%b,%1,%0)=@attach %!/INC`CODE`REMFROMDIVISION=%0,%1,,,elements(##,2,`);&D`GROUPS %1=setdiff(get(%1/D`GROUPS),num(%0));@attach %!/WIPE=%1,D`CACHE
 
 &FIL`ISDIVMEMBER [u(cobj,gms)]=match(get(%2/%0),u(objid,%1))
 
@@ -267,7 +267,7 @@ th u(NEWCOBJ,Group Object Parent <GOP>,gop,u(cobj,gms),,1,WIZARD SAFE,INHERIT SI
 &INC`CODE`UNMUZZLE [u(cobj,gms)]=@check u(isgroupmember,u(objid,%#),%q<gid1>)=@attach %!/INC`MSG=ERROR: You are not a member of %q<gname1>.;@check u(FUN`GRPPERM,u(objid,%#),%q<gid1>,MODERATE)=@attach %!/INC`MSG=ERROR: You lack permission to do that.;@attach %!/INC`CHECKPC=before(%0,/),1;@check u(isgroupmember,%q<t1objid>,%q<gid1>)=@attach %!/INC`MSG=ERROR: Must target a group member.;@check lt(u(FUN`GETRANK,%q<gid1>,u(objid,%#)),u(FUN`GETRANK,%q<gid1>,%q<t1objid>))=@attach %!/INC`MSG=ERROR: Only subordinates may be unmuzzled.;@check strlen(after(%0,/))=@attach %!/INC`MSG=ERROR: Channel Type Empty. Your choices are IC and OOC!;@attach %!/INC`PARTIAL=after(%0,/),IC|OOC,|,chan,Channel Type;@check gt(get(%q<t1>/D`GROUP`%q<gid1>`MUZZLE`%q<chan>),secs())=@attach %!/INC`MSG=%q<t1name> is not %q<chan> muzzled.;&D`GROUP`%q<gid1>`MUZZLE`%q<chan> %q<t1>;@attach %!/INC`CODE`MAKELOG=u(objid,%#),%q<gid1>,{Unmuzzled %q<t1name> from [ucstr(%q<chan>)] channels};@attach %!/INC`CODE`CHAT={[ansi(hw,ALERT:)] %n unmuzzled %q<t1name> from [ucstr(%q<chan>)] channels},OOC,1
 
 &INC`CHOOSE`+G`SET`MAIN [u(cobj,gms)]=@attach %!/INC`CODE`VALGROUP=u(strfirstof,u(getstat,%#,D`GROUP,Group),0),1;@attach %!/INC`CODE`SET
-&INC`CODE`SET [u(cobj,gms)]=@select/inline gt(strlen(%0),0)=1,{@check lte(u(FUN`GETRANK,%q<gid1>,u(objid,%#)),1)=@attach %!/INC`MSG=ERROR: You lack permission to do that.;@check strlen(%0)=@attach %!/INC`MSG=ERROR: Setting field empty.;@attach %!/INC`PARTIAL=%0,u(setr,choices,COLOR|STARTRANK|IC|OOC|COMMAND|CHANNELRANK|SYSALERT[if(u(isadmin,%#),|MAJOR|TYPE|SORT|ABBREVIATION)]),|,c,choice;@select/inline t(strlen(%1))=0,{&SET`%qc %q<gid1>;@attach %!/INC`MSG=Option restored to group defaults.},1,{@select/inline hasattr(%!/INC`CODE`SET`CHECK`%qc)=1,{@attach %!/INC`CODE`SET`CHECK`%qc};&SET`%qc %q<gid1>=u(strfirstof,%q<entry>,%1)};@attach %!/INC`CODE`MAKELOG=u(objid,%#),%q<gid1>,{Setting %qc: %1};@attach %!/INC`MSG=You have changed %q<gname1>'s %qc Setting to: %1;@attach %!/INC`CODE`CHAT={[ansi(hw,ALERT:)] %n changed %qc Setting to: %1},OOC,1},0,{@pemit %#=u(header,%q<gname1> - Settings);@dolist/inline lattrp(%q<gid1>/SET`*)={@pemit %#=rjust(last(##,`),10): [get(%q<gid1>/##)]};@pemit %#=u(subheader)}
+&INC`CODE`SET [u(cobj,gms)]=@select/inline gt(strlen(%0),0)=1,{@check lte(u(FUN`GETRANK,%q<gid1>,u(objid,%#)),1)=@attach %!/INC`MSG=ERROR: You lack permission to do that.;@check strlen(%0)=@attach %!/INC`MSG=ERROR: Setting field empty.;@attach %!/INC`PARTIAL=%0,u(setr,choices,COLOR|STARTRANK|IC|OOC|COMMAND|CHANNELRANK|SYSALERT[if(u(isadmin,%#),|MAJOR|TYPE|SORT|ABBREVIATION)]),|,c,choice;@select/inline t(strlen(%1))=0,{&SET`%qc %q<gid1>;@attach %!/INC`MSG=Option restored to group defaults.},1,{@select/inline hasattr(%!/INC`CODE`SET`CHECK`%qc)=1,{@attach %!/INC`CODE`SET`CHECK`%qc};&SET`%qc %q<gid1>=u(strfirstof,%q<entry>,%1)};@select/inline %qc=MAJOR,{@dolist/inline get(%q<gid1>/MEMBERS)={@attach %!/WIPE=##,D`CACHE}};@attach %!/INC`CODE`MAKELOG=u(objid,%#),%q<gid1>,{Setting %qc: %1};@attach %!/INC`MSG=You have changed %q<gname1>'s %qc Setting to: %1;@attach %!/INC`CODE`CHAT={[ansi(hw,ALERT:)] %n changed %qc Setting to: %1},OOC,1},0,{@pemit %#=u(header,%q<gname1> - Settings);@dolist/inline lattrp(%q<gid1>/SET`*)={@pemit %#=rjust(last(##,`),10): [get(%q<gid1>/##)]};@pemit %#=u(subheader)}
 
 &INC`CODE`SET`CHECK`STARTRANK [u(cobj,gms)]=@check u(valnum,%1)=@attach %!/INC`MSG=ERROR: STARTRANK must be a number!;@stop lte(%1,2)=@attach %!/INC`MSG=ERROR: STARTRANK may not be higher than 3.;@stop lte(%1,u(FUN`GETRANK,%q<gid1>,u(objid,%#)))=@attach %!/INC`MSG=ERROR: Cannot raise STARTRANK beyond your own rank.;@check hasattrp(%q<gid1>/RANK`[abs(%1)])=@attach %!/INC`MSG=ERROR: Cannot find that rank.;th u(setq,entry,abs(%1))
 &INC`CODE`SET`CHECK`IC [u(cobj,gms)]=@check isint(%1)=@attach %!/INC`MSG=ERROR: IC must be a number!;th u(setq,entry,t(%1))
diff --git a/Who System - WHO.txt b/Who System - WHO.txt
index 31abc78..45622b7 100644
--- a/Who System - WHO.txt	
+++ b/Who System - WHO.txt	
@@ -32,7 +32,7 @@ th u(NEWCONF,config,WHO,SHOW_IPS,1,Show # of unique IPs?,BOOL)
 &INC`WHO`HEADER`MAIN [u(cobj,who)]=@pemit %#=ansi(u(color,%#,WHO,COLUMN_NAMES),align(20 11 3 4  4 1 29,Name,Alias,Fac,Idle,Conn,G,Location))
 &INC`WHO`HEADER`IDLE [u(cobj,who)]=@attach %!/INC`WHO`HEADER`MAIN
 
-&FUN`WHO`PLAYERLINE`MAIN [u(cobj,who)]=align(20 11 -3 >4 >4 1 [sub(u(width,%#),49)],u(pueblize,if(u(ishidden,%0),ansi(hx,name(%0)),u(moniker,%0)),+finger [name(%0)]),u(getalias,%0),u(strfirstof,u(getproperty,%0,FACABBR),ansi(hx,---)),u(hideidle,%0),u(hideconn,%0),ucstr(left(default(%0/sex,?),1)),if(not(findable(%#,%0)),*UNFINDABLE*,if(match(%q<portable>,loc(%0)),u(pueblize,left(name(loc(%0)),sub(u(width,%#),49)),+port [loc(%0)]),left(name(loc(%0)),sub(u(width,%#),49)))))
+&FUN`WHO`PLAYERLINE`MAIN [u(cobj,who)]=align(20 11 -3 >4 >4 1 [sub(u(width,%#),49)],u(pueblize,if(u(ishidden,%0),ansi(hx,name(%0)),u(moniker,%0)),+finger [name(%0)]),u(getalias,%0),u(strfirstof,u(getproperty,%0,MAJORABBR),ansi(hx,---)),u(hideidle,%0),u(hideconn,%0),ucstr(left(default(%0/sex,?),1)),if(not(findable(%#,%0)),*UNFINDABLE*,if(match(%q<portable>,loc(%0)),u(pueblize,left(name(loc(%0)),sub(u(width,%#),49)),+port [loc(%0)]),left(name(loc(%0)),sub(u(width,%#),49)))))
 &FUN`WHO`PLAYERLINE`IDLE [u(cobj,who)]=u(FUN`WHO`PLAYERLINE`MAIN,%0)
 
 @@ &STARTUP [u(cobj,who)]=@hook/override WHO=%!,CMD`+WHO`[v(game)]
diff --git a/unfinished/storyteller/Character Data Editor - DATA.txt b/unfinished/storyteller/Character Data Editor - DATA.txt
new file mode 100644
index 0000000..f4cfecf
--- /dev/null
+++ b/unfinished/storyteller/Character Data Editor - DATA.txt	
@@ -0,0 +1,50 @@
+
+th u(newcobj,Character Data Editor <DATA>,data,,,,WIZARD SAFE !NO_COMMAND,INHERIT SIDEFX SAFE)
+@lock/use [u(cobj,data)]=ISADMIN2/1
+
+&CMD`+EDITCHAR`PENNMUSH [u(cobj,data)]=$^\+editchar(?\:/(\S+))?(?\: +(.+?))?(?\:=(.*))?$:@attach %!/CMD`+WHO`MAIN
+@set [u(cobj,data)]/CMD`+EDITCHAR`PENNMUSH=regexp
+&CMD`+EDITCHAR`RHOSTMUSH [u(cobj,data)]=$^\+editchar(?\:/(\\S+))?(?\: +(.+?))?(?\:=(.*))?$:@attach %!/CMD`+WHO`MAIN
+@set [u(cobj,data)]/CMD`+EDITCHAR`RHOSTMUSH=regexp
+&CMD`+EDITCHAR`MAIN [u(cobj,data)]=@attach %!/INC`GETSWITCH=%1,|,switch,switch;th iter(before(%2,=),u(setq,chr(add(inum(0),64)),%i0),|);@attach %!/INC`CHECKPC=%qa,1;@check strlen(%qb)=@attach %!/INC`MSG=ERROR: No Type entered to %q<switch> Your choices are: [itemize(iter(u(lattr,[u(cobj,data)]/INC`%q<switch>`*,|),last(%i0,`),|,|),|,and,\,)]!;@attach %!/INC`PARTIAL=%qb,iter(u(lattr,%!/INC`%q<switch>`*,|),last(%i0,`),|,|),|,topic,option;@attach [u(cobj,data)]/INC`%q<switch>`%q<topic>=%q<t1>,after(iter(%2,trim(%i0),|,|),elements(%2,1,|)|),squish(squish(trim(%3)),|)
+@set [u(cobj,data)]/CMD`+EDITCHAR`[switch(v(game),PennMUSH,RHOSTMUSH,RhostMUSH,PENNMUSH)]=no_command
+
+&GETSPHERE [u(cobj,data)]=u(strfirstof,u(getstat,%0/D`INFO,Sphere),Mortal)
+
+&STARTUP [u(cobj,data)]=@select/inline v(game)=PennMUSH,{@function getsphere=%!,GETSPHERE},RhostMUSH,{@function/privileged getsphere=%!,GETSPHERE}
+
+&SWITCHES`ADMIN [u(cobj,data)]=SET|REM|ADD
+&SYSTEM`NAME [u(cobj,data)]=EDITCHAR
+
+&DO`ANNOUNCE [u(cobj,data)]=@attach %!/INC`MSG`CHAN=%1;@select/inline strmatch(%#,%0)=0,{@attach %!/INC`MSG=%2,%0;@attach %!/INC`MSG=%3},1,{@attach %!/INC`MSG=%2,%0}
+
+@@ %0 - player being modified. %1 - message for admin channel. %2 - message for player. %3 - message for admin.
+
+@@ Advantages
+
+&INC`SET`SPHERE [u(cobj,data)]=@attach %!/DO`SET`SPHERE;@attach %!/DO`ANNOUNCE=%0,{[ansi(h,name(%0))]'s [u(setr,msg,Splat is now set to: [ansi(h,u(capnames,%q<find>))])]},{Your %q<msg>},{[ansi(h,name(%0))]'s %q<msg>}
+
+&DO`VAL`SPHERE [u(cobj,data)]=@check strlen(%2)=@attach %!/INC`MSG=ERROR: No Splat name entered.;@attach %!/INC`PARTIAL=%2,get(u(cobj,data)/SPHERES),|,find,sphere;
+&DO`SET`SPHERE [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`SPHERE;@attach [u(cobj,data)]/KEYVALUE`SET=%0,D`INFO,SPHERE,u(capnames,%q<find>)
+
+&SPHERES [u(cobj,data)]=MORTAL
+
+&INC`SET`POWER [u(cobj,data)]=@attach %!/DO`SET`POWER;@attach %!/DO`ANNOUNCE=%0,{[u(setr,msg,ansi(h,name(%0))'s [u(setr,have,Power is now: [ansi(h,%q<entry>)])])]},{Your %q<have>},{%q<msg>}
+
+&DO`VAL`POWER [u(cobj,data)]=@check u(valnum,%2)=@attach %!/INC`MSG=ERROR: Power must be a positive integer.;th u(setq,entry,%2)
+&DO`SET`POWER [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`POWER;@attach [u(cobj,data)]/KEYVALUE`SET=%0,D`INFO,POWER,%q<entry>
+
+th u(setstat,%0,D`INFO,Power,%q<entry>)
+
+&INC`SET`WILLPOWER [u(cobj,data)]=@attach %!/DO`SET`WILLPOWER;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0))'s [u(setr,have,Willpower is now: [ansi(h,%q<entry>)])])},{Your %q<have>},{%q<msg>}
+
+&DO`VAL`WILLPOWER [u(cobj,data)]=@check u(valnum,%2)=@attach %!/INC`MSG=ERROR: Willpower must be a positive integer.;th u(setq,entry,%2)
+&DO`SET`WILLPOWER [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`WILLPOWER;@attach [u(cobj,data)]/KEYVALUE`SET=%0,D`INFO,WILLPOWER,%q<entry>
+
+
+
+&WORDLIST`VAL [u(cobj,data)]=@stop u(charsearch,%2,~)=@attach %!/INC`MSG=ERROR: ~ is a system-reserved character.;th u(setq,filtered,u(filter,STRLEN,iter(ucstr(%2),squish(%i0),|,|),|,|))
+&KEYVALUE`SET [u(cobj,data)]=@stop u(charsearch,%2 %3,| ~)=@attach %!/INC`MSG=ERROR: ~ and | are system-reserved characters.;@select/inline strlen(%3)=>0,{th u(setstat,%0,%1,ucstr(%2),%3)},{th u(delstat,%0,%1,ucstr(%2))}
+&WORDLIST`ADD [u(cobj,data)]=@attach [u(cobj,data)]/WORDLIST`VAL;@dolist/inline/delimit | %q<filtered>=th u(setstat,%0,%1,##,add(1,u(getstat,%0,%1,##)));th u(setq,returnlist,iter(ucstr(%2),%i0~[u(getstat,%0,%1,##)],|,|))
+&WORDLIST`DEL [u(cobj,data)]=@attach [u(cobj,data)]/WORDLIST`VAL;@dolist/inline/delimit | %q<filtered>=@select/inline u(setr,rank,u(getstat,%0,%1,##))=>1,{th u(setstat,%0,%1,##,sub(%q<rank>,1))},{th u(delstat,%0,%1,##)};th u(setq,returnlist,iter(ucstr(%2),%i0~[bound(u(getstat,%0,%1,%i0),0)],|,|))
+@@ %0 - Target. %1 - Attr. %2 - List. %3 - Entry for keyvalue.
\ No newline at end of file
diff --git a/unfinished/storyteller/exalted3/Character Data Object - EX-CDO.txt b/unfinished/storyteller/exalted3/Character Data Object - EX-CDO.txt
index 0ee98fe..63c61f7 100644
--- a/unfinished/storyteller/exalted3/Character Data Object - EX-CDO.txt	
+++ b/unfinished/storyteller/exalted3/Character Data Object - EX-CDO.txt	
@@ -1,245 +1,206 @@
-
-@tel create(Character Data Object <EX-CDO>)=config(master_room)
-&ex-cdo u(coi)=locate(config(master_room),Character Data Object <EX-CDO>,TXxi)
-@parent u(ex-cdo)=u(coi)
-@set u(ex-cdo)=WIZARD !NO_COMMAND
-@lock/command u(ex-cdo)=@[u(sgo)]/Command
-
-&GFN`GETSPLAT u(ex-cdo)=strfirstof(getstat(%0/D`INFO,Splat),Mortal)
-&GFN`GETBONUS u(srs)=add(getstat(%0/D`BONUS,%1),if(strmatch(getsplat(%0),WEREWOLF),getstat(u(nsco)/VAR`WEREWOLF`[getform(%0)],%1)))
-
-&CMD`+EDITCHAR u(ex-cdo)=$^\+editchar(?\:/(\S+))?(?\: +(.+?))?(?\:=(.*))?$:@attach u(ccs)/INC`PARTIAL=%1,setunion(v(VAR`PLAYFLAGS),if(isadmin(%#),v(VAR`ADMINFLAGS)),|,|),|,EDITCHAR,switch,switch;th iter(before(%2,=),u(setq,chr(add(inum(0),64)),%i0),|);@attach u(ccs)/INC`CHECKPC=%qa,1,EDITCHAR;@check strlen(%qb)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Type entered to %q<switch> Your choices are: [itemize(iter(u(lattr,u(ex-cdo)/INC`%q<switch>`*,|),last(%i0,`),|,|),|,and,\,)]!;@attach u(ccs)/INC`PARTIAL=%qb,iter(u(lattr,u(ex-cdo)/INC`%q<switch>`*,|),last(%i0,`),|,|),|,EDITCHAR,topic,option;@attach u(ex-cdo)/INC`%q<switch>`%q<topic>=%q<t1>,after(iter(%2,trim(%i0),|,|),elements(%2,1,|)|),squish(squish(trim(%3)),|)
-@set u(ex-cdo)/CMD`+EDITCHAR=regexp
-
-&VAR`PLAYFLAGS u(ex-cdo)=
-&VAR`ADMINFLAGS u(ex-cdo)=SET|REM|ADD
-&VAR`MSGHEAD u(ex-cdo)=EDITCHAR
-&RFN`MSGHEAD u(ex-cdo)=msghead(v(VAR`MSGHEAD))
-&RFN`HEADER u(ex-cdo)=header(%0,,EDITCHAR`BORDER,EDITCHAR`BORDERDOT,EDITCHAR`BORDERTEXT,1)
-&RFN`SEPARATOR u(ex-cdo)=separator(%0,,EDITCHAR`BORDER,EDITCHAR`BORDERDOT,EDITCHAR`BORDERTEXT,1)
-&RFN`SUBHEADER u(ex-cdo)=subheader(%0,,EDITCHAR`BORDER,EDITCHAR`BORDERDOT,EDITCHAR`BORDERTEXT,1)
-
-&DO`ANNOUNCE u(ex-cdo)=@attach u(ccs)/INC`CMSG=%1,%#,v(VAR`MSGHEAD),u(cmo`staffrep);@select/inline strmatch(%#,%0)=0,{@attach u(ccs)/INC`MSG=v(VAR`MSGHEAD),%0,%2;@attach u(ccs)/INC`MSG=v(VAR`MSGHEAD),%#,%3},1,{@attach u(ccs)/INC`MSG=v(VAR`MSGHEAD),%0,%2}
-
-@@ %0 - player being modified. %1 - message for admin channel. %2 - message for player. %3 - message for admin.
-
 @@ Advantages
 
-&INC`SET`SPLAT u(ex-cdo)=@attach u(ex-cdo)/DO`SET`SPLAT;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,Splat is now set to: [ansi(h,capnames(%q<find>))])]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}
-
-&DO`VAL`SPLAT u(ex-cdo)=@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Splat name entered.;@attach u(ccs)/INC`PARTIAL=%2,get(u(ex-cdo)/VAR`SPLATS),|,v(VAR`MSGHEAD),find,splat;
-&DO`SET`SPLAT u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`SPLAT;th setstat(%0/D`INFO,Splat,capnames(%q<find>))
-
-&VAR`SPLATS u(ex-cdo)=SOLAR|MORTAL
-
-&INC`SET`CASTE u(ex-cdo)=@attach u(ex-cdo)/DO`SET`CASTE;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,Caste is now set to: [ansi(h,capnames(%q<find>))])]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}
-
-&DO`VAL`CASTE u(ex-cdo)=th u(setq,splat,getsplat(%0));@check words(u(setr,castes,get(u(ex-cdo)/VAR`CASTE`%q<splat>)),|)=@pemit %#=u(RFN`MSGHEAD) [capnames(%q<splat>)]s do not have Castes.;@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Caste name entered.;@attach u(ccs)/INC`PARTIAL=%2,%q<castes>,|,v(VAR`MSGHEAD),find,caste
-&DO`SET`CASTE u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`CASTE;th setstat(%0/D`INFO,Caste,capnames(%q<find>))
-
-&VAR`CASTE`SOLAR u(ex-cdo)=DAWN|ZENITH|TWILIGHT|NIGHT|ECLIPSE
-&VAR`CASTE`LUNAR u(ex-cdo)=FULL MOON|CHANGING MOON|NO MOON|CASTELESS
-&VAR`CASTE`TERRESTRIAL u(ex-cdo)=AIR|EARTH|FIRE|WATER|WOOD
-&VAR`CASTE`ABYSSAL u(ex-cdo)=DUSK|MIDNIGHT|DAYBREAK|DAY|MOONSHADOW
-&VAR`CASTE`LIMINAL u(ex-cdo)=BLOOD|BREATH|FLESH|MARROW|SOIL
-&VAR`CASTE`SIDEREAL u(ex-cdo)=JOURNEYS|ENDINGS|BATTLES|SECRETS|SERENITY
-
-&VAR`CASTE`ALCHEMICAL u(ex-cdo)=ORICHALCUM|MOONSILVER|JADE|SOULSTEEL|STARMETAL|ADAMANT
-&VAR`CASTE`DRAGON-KING u(ex-cdo)=ANKLOK|MOSOK|PTEROK|RAPTOK
-&VAR`CASTE`GOD-BLOODED u(ex-cdo)=DIVINE|GHOST|DEMON|FAE|SOLAR|LUNAR|SIDEREAL|ABYSSAL|INFERNAL
-&VAR`CASTE`INFERNAL u(ex-cdo)=SLAYER|FIEND|SCOURGE|MALEFACTOR|DEFILER
-&VAR`CASTE`JADEBORN u(ex-cdo)=ARTISAN|WORKER|WARRIOR
-&VAR`CASTE`RAKSHA u(ex-cdo)=DIPLOMAT|COURTIER|IMPERIAL RAKSHA|SCRIBE|ENTERTAINER|LUMINARY|ESHU|ORNAMENTAL RAKSHA|WARRIOR|ANARCH|XIA|CATAPHRACT|WORKER|PANJANDRUM|ARTISAN|STRATEGOS|GUIDE|HARBINGER|VAGABOND|NOMAD|FERRYMAN|HERALD|SKALD|DRAGOON|ATTENDANT
-&VAR`CASTE`SPIRIT u(ex-cdo)=GOD|DEMON
+&INC`SET`SPLAT [u(cobj,data)]=@attach [u(cobj,data)]/INC`SET`SPHERE
+&SPHERES [u(cobj,data)]=SOLAR|MORTAL
 
-&INC`SET`ESSENCE u(ex-cdo)=@attach u(ex-cdo)/DO`SET`ESSENCE;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0))'s [u(setr,have,Essence is now: [ansi(h,%q<entry>)])])},{Your %q<have>},{%q<msg>}
+&INC`SET`CASTE [u(cobj,data)]=@attach [u(cobj,data)]/DO`SET`CASTE;@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,Caste is now set to: [ansi(h,u(capnames,%q<find>))])]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}
 
-&DO`VAL`ESSENCE u(ex-cdo)=@check valnum(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Essence must be a positive integer.;th u(setq,entry,%2)
-&DO`SET`ESSENCE u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`ESSENCE;th setstat(%0/D`INFO,Essence,%q<entry>)
+&DO`VAL`CASTE [u(cobj,data)]=th u(setq,splat,u(getsphere,%0));@check words(u(setr,castes,get(u(cobj,data)/CASTE`%q<splat>)),|)=@attach %!/INC`MSG=[u(capnames,%q<splat>)]s do not have Castes.;@check strlen(%2)=@attach %!/INC`MSG=ERROR: No Caste name entered.;@attach u(ccs)/INC`PARTIAL=%2,%q<castes>,|,find,caste
+&DO`SET`CASTE [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`CASTE;th u(setstat,%0/D`INFO,Caste,u(capnames,%q<find>))
 
-&INC`SET`WILLPOWER u(ex-cdo)=@attach u(ex-cdo)/DO`SET`WILLPOWER;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0))'s [u(setr,have,Willpower is now: [ansi(h,%q<entry>)])])},{Your %q<have>},{%q<msg>}
+&CASTE`SOLAR [u(cobj,data)]=DAWN|ZENITH|TWILIGHT|NIGHT|ECLIPSE
+&CASTE`LUNAR [u(cobj,data)]=FULL MOON|CHANGING MOON|NO MOON|CASTELESS
+&CASTE`TERRESTRIAL [u(cobj,data)]=AIR|EARTH|FIRE|WATER|WOOD
+&CASTE`ABYSSAL [u(cobj,data)]=DUSK|MIDNIGHT|DAYBREAK|DAY|MOONSHADOW
+&CASTE`LIMINAL [u(cobj,data)]=BLOOD|BREATH|FLESH|MARROW|SOIL
+&CASTE`SIDEREAL [u(cobj,data)]=JOURNEYS|ENDINGS|BATTLES|SECRETS|SERENITY
 
-&DO`VAL`WILLPOWER u(ex-cdo)=@check valnum(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Willpower must be a positive integer.;th u(setq,entry,%2)
-&DO`SET`WILLPOWER u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`WILLPOWER;th setstat(%0/D`INFO,Willpower,%q<entry>)
+&CASTE`ALCHEMICAL [u(cobj,data)]=ORICHALCUM|MOONSILVER|JADE|SOULSTEEL|STARMETAL|ADAMANT
+&CASTE`DRAGON-KING [u(cobj,data)]=ANKLOK|MOSOK|PTEROK|RAPTOK
+&CASTE`GOD-BLOODED [u(cobj,data)]=DIVINE|GHOST|DEMON|FAE|SOLAR|LUNAR|SIDEREAL|ABYSSAL|INFERNAL
+&CASTE`INFERNAL [u(cobj,data)]=SLAYER|FIEND|SCOURGE|MALEFACTOR|DEFILER
+&CASTE`JADEBORN [u(cobj,data)]=ARTISAN|WORKER|WARRIOR
+&CASTE`RAKSHA [u(cobj,data)]=DIPLOMAT|COURTIER|IMPERIAL RAKSHA|SCRIBE|ENTERTAINER|LUMINARY|ESHU|ORNAMENTAL RAKSHA|WARRIOR|ANARCH|XIA|CATAPHRACT|WORKER|PANJANDRUM|ARTISAN|STRATEGOS|GUIDE|HARBINGER|VAGABOND|NOMAD|FERRYMAN|HERALD|SKALD|DRAGOON|ATTENDANT
+&CASTE`SPIRIT [u(cobj,data)]=GOD|DEMON
 
 @@ Attributes
 
-&INC`SET`ATTRIBUTE u(ex-cdo)=@attach u(ex-cdo)/DO`SET`ATTRIBUTE=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Attribute was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Attribute was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
+&INC`SET`ATTRIBUTE [u(cobj,data)]=@attach [u(cobj,data)]/DO`SET`ATTRIBUTE=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Attribute was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Attribute was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
 
-&DO`VAL`ATTRIBUTE u(ex-cdo)=@check strlen(%1)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Attribute name entered.;@attach u(ccs)/INC`PARTIAL=%1,u(u(ex-cdo)/FUN`GET`ATTRIBUTES),|,EDITCHAR,find,attribute;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check valnum(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Attributes must be positive integers.}
-&DO`SET`ATTRIBUTE u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`ATTRIBUTE;@select/inline strlen(%q<entry>)=0,{th delstat(%0/D`ATTRIBUTES,ucstr(%q<find>))},{th setstat(%0/D`ATTRIBUTES,ucstr(%q<find>),%q<entry>)}
+&DO`VAL`ATTRIBUTE [u(cobj,data)]=@check strlen(%1)=@attach %!/INC`MSG=ERROR: No Attribute name entered.;@attach %!/INC`PARTIAL=%1,u(u(cobj,data)/FUN`GET`ATTRIBUTES),|,find,attribute;@select/inline strlen(u(setr,entry,%2))=>0,{@check u(valnum,%2)=@attach %!/INC`MSG=ERROR: Attributes must be positive integers.}
+&DO`SET`ATTRIBUTE [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`ATTRIBUTE;@attach [u(cobj,data)]/KEYVALUE`SET=%0,D`ATTRIBUTES,%q<find>,%q<entry>
 
-&FUN`GET`ATTRIBUTES u(ex-cdo)=get(u(ex-cdo)/VAR`ATTRIBUTES)
-&FUN`RET`ATTRIBUTES u(ex-cdo)=iter(ucstr(get(%0/D`ATTRIBUTES)),before(%i0,~),|,|)
+&FUN`GET`ATTRIBUTES [u(cobj,data)]=v(ATTRIBUTES)
+&FUN`RET`ATTRIBUTES [u(cobj,data)]=iter(ucstr(get(%0/D`ATTRIBUTES)),before(%i0,~),|,|)
 
-&VAR`ATTRIBUTES u(ex-cdo)=STRENGTH|CHARISMA|PERCEPTION|DEXTERITY|MANIPULATION|INTELLIGENCE|STAMINA|APPEARANCE|WITS
+&ATTRIBUTES [u(cobj,data)]=STRENGTH|CHARISMA|PERCEPTION|DEXTERITY|MANIPULATION|INTELLIGENCE|STAMINA|APPEARANCE|WITS
 
 @@ Abilities
 
-&INC`SET`ABILITY u(ex-cdo)=@attach u(ex-cdo)/DO`SET`ABILITY=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Ability was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Ability was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
+&INC`SET`ABILITY [u(cobj,data)]=@attach [u(cobj,data)]/DO`SET`ABILITY=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Ability was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach %!/DO`ANNOUNCE=%0,{[ansi(h,name(%0))]'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Ability was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{[ansi(h,name(%0))]'s %q<msg>}}
 
-&DO`VAL`ABILITY u(ex-cdo)=@check strlen(%1)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Ability name entered.;@attach u(ccs)/INC`PARTIAL=%1,u(u(ex-cdo)/FUN`GET`ABILITIES),|,EDITCHAR,find,ability;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check valnum(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Abilities must be positive integers.}
-&DO`SET`ABILITY u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`ABILITY;@select/inline strlen(%q<entry>)=0,{th delstat(%0/D`ABILITIES,ucstr(%q<find>))},{th setstat(%0/D`ABILITIES,ucstr(%q<find>),%q<entry>)}
+&DO`VAL`ABILITY [u(cobj,data)]=@check strlen(%1)=@attach %!/INC`MSG=ERROR: No Ability name entered.;@attach u(ccs)/INC`PARTIAL=%1,u([u(cobj,data)]/FUN`GET`ABILITIES),|,find,ability;@select/inline strlen(u(setr,entry,%2))=>0,{@check u(valnum,%2)=@attach %!/INC`MSG=ERROR: Abilities must be positive integers.}
+&DO`SET`ABILITY [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`ABILITY;@select/inline strlen(%q<entry>)=0,{th u(delstat,%0/D`ABILITIES,ucstr(%q<find>))},{th u(setstat,%0/D`ABILITIES,ucstr(%q<find>),%q<entry>)}
 
-&FUN`GET`ABILITIES u(ex-cdo)=get(u(ex-cdo)/VAR`ABILITIES)
-&FUN`RET`ABILITIES u(ex-cdo)=iter(ucstr(get(%0/D`ABILITIES)),before(%i0,~),|,|)
+&FUN`GET`ABILITIES [u(cobj,data)]=get(u(cobj,data)/VAR`ABILITIES)
+&FUN`RET`ABILITIES [u(cobj,data)]=iter(ucstr(get(%0/D`ABILITIES)),before(%i0,~),|,|)
 
-&FUN`GET`ABILITIES`EXTRA u(ex-cdo)=ARCHERY|BRAWL|MARTIAL ARTS|MELEE|THROWN|WAR|BUREAUCRACY|LINGUISTICS|RIDE|SAIL|SOCIALIZE|ATHLETICS|AWARENESS|DODGE|LARCENY|STEALTH|CRAFT|INVESTIGATION|LORE|MEDICINE|OCCULT|INTEGRITY|PERFORMANCE|PRESENCE|RESISTANCE|SURVIVAL
+&FUN`GET`ABILITIES`EXTRA [u(cobj,data)]=ARCHERY|BRAWL|MARTIAL ARTS|MELEE|THROWN|WAR|BUREAUCRACY|LINGUISTICS|RIDE|SAIL|SOCIALIZE|ATHLETICS|AWARENESS|DODGE|LARCENY|STEALTH|CRAFT|INVESTIGATION|LORE|MEDICINE|OCCULT|INTEGRITY|PERFORMANCE|PRESENCE|RESISTANCE|SURVIVAL
 
-&VAR`ABILITIES u(ex-cdo)=ARCHERY|BRAWL|MELEE|THROWN|WAR|BUREAUCRACY|LINGUISTICS|RIDE|SAIL|SOCIALIZE|ATHLETICS|AWARENESS|DODGE|LARCENY|STEALTH|CRAFT|INVESTIGATION|LORE|MEDICINE|OCCULT|INTEGRITY|PERFORMANCE|PRESENCE|RESISTANCE|SURVIVAL
+&VAR`ABILITIES [u(cobj,data)]=ARCHERY|BRAWL|MELEE|THROWN|WAR|BUREAUCRACY|LINGUISTICS|RIDE|SAIL|SOCIALIZE|ATHLETICS|AWARENESS|DODGE|LARCENY|STEALTH|CRAFT|INVESTIGATION|LORE|MEDICINE|OCCULT|INTEGRITY|PERFORMANCE|PRESENCE|RESISTANCE|SURVIVAL
 
-&INC`SET`STYLES u(ex-cdo)=@attach u(ex-cdo)/DO`SET`STYLES=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Style was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Style was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
+&INC`SET`STYLES [u(cobj,data)]=@attach [u(cobj,data)]/DO`SET`STYLES=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Style was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Style was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
 
-&DO`VAL`STYLES u(ex-cdo)=@check strlen(%1)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Style name entered.;@attach u(ccs)/INC`PARTIAL=%1,u(u(ex-cdo)/FUN`GET`STYLES),|,EDITCHAR,find,style;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check valnum(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Styles must be positive integers.}
-&DO`SET`STYLES u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`STYLES;@select/inline strlen(%q<entry>)=0,{th delstat(%0/D`STYLES,ucstr(%q<find>))},{th setstat(%0/D`STYLES,ucstr(%q<find>),%q<entry>)}
+&DO`VAL`STYLES [u(cobj,data)]=@check strlen(%1)=@attach %!/INC`MSG=ERROR: No Style name entered.;@attach u(ccs)/INC`PARTIAL=%1,u([u(cobj,data)]/FUN`GET`STYLES),|,EDITCHAR,find,style;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check u(valnum,%2)=@attach %!/INC`MSG=ERROR: Styles must be positive integers.}
+&DO`SET`STYLES [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`STYLES;@select/inline strlen(%q<entry>)=0,{th u(delstat,%0/D`STYLES,ucstr(%q<find>))},{th u(setstat,%0/D`STYLES,ucstr(%q<find>),%q<entry>)}
 
-&INC`SET`CRAFTS u(ex-cdo)=@attach u(ex-cdo)/DO`SET`CRAFTS=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Craft was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,capnames(%q<find>))]' Craft was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
+&INC`SET`CRAFTS [u(cobj,data)]=@attach [u(cobj,data)]/DO`SET`CRAFTS=%0,elements(%1,2,|),%2;@select/inline t(strlen(%q<entry>))=0,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Craft was cleared.)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}},1,{@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0))'s [u(setr,msg,'[ansi(h,u(capnames,%q<find>))]' Craft was set to: [ansi(h,%q<entry>)].)]},{Your %q<msg>},{ansi(h,name(%0))'s %q<msg>}}
 
-&DO`VAL`CRAFTS u(ex-cdo)=@check strlen(%1)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Craft name entered.;@attach u(ccs)/INC`PARTIAL=%1,u(u(ex-cdo)/FUN`GET`CRAFTS),|,EDITCHAR,find,Craft;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check valnum(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Crafts must be positive integers.}
-&DO`SET`CRAFTS u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`CRAFTS;@select/inline strlen(%q<entry>)=0,{th delstat(%0/D`CRAFTS,ucstr(%q<find>))},{th setstat(%0/D`CRAFTS,ucstr(%q<find>),%q<entry>)}
+&DO`VAL`CRAFTS [u(cobj,data)]=@check strlen(%1)=@attach %!/INC`MSG=ERROR: No Craft name entered.;@attach u(ccs)/INC`PARTIAL=%1,u([u(cobj,data)]/FUN`GET`CRAFTS),|,EDITCHAR,find,Craft;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check u(valnum,%2)=@attach %!/INC`MSG=ERROR: Crafts must be positive integers.}
+&DO`SET`CRAFTS [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`CRAFTS;@select/inline strlen(%q<entry>)=0,{th u(delstat,%0/D`CRAFTS,ucstr(%q<find>))},{th u(setstat,%0/D`CRAFTS,ucstr(%q<find>),%q<entry>)}
 
-&FUN`RET`CRAFTS u(ex-cdo)=iter(ucstr(get(%0/D`CRAFTS)),before(%i0,~),|,|)
+&FUN`RET`CRAFTS [u(cobj,data)]=iter(ucstr(get(%0/D`CRAFTS)),before(%i0,~),|,|)
 
-&FUN`GET`CRAFTS u(ex-cdo)=v(VAL`CRAFTS)
-&VAL`CRAFTS u(ex-cdo)=ARTIFACTS|GEOMANCY|FIRST AGE ARTIFICE
+&FUN`GET`CRAFTS [u(cobj,data)]=v(VAL`CRAFTS)
+&VAL`CRAFTS [u(cobj,data)]=ARTIFACTS|GEOMANCY|FIRST AGE ARTIFICE
 
 @@ Specialties
 
-&INC`SET`SPECIALTY u(ex-cdo)=@attach u(ex-cdo)/Do`SET`SPECIALTY=%0,elements(%1,2,|),%2;@select/inline t(%q<entry>)=1,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now has the [u(setr,have,ansi(h,capnames(%q<find>/%q<spec>)) Specialty at [ansi(h,%q<entry>)])] )},{You now have the %q<have>},{%q<msg>}},0,{@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) has lost the [u(setr,have,ansi(h,capnames(%q<find>/%q<spec>)) Specialty)] )},{You have lost the %q<have>},{%q<msg>}}
+&INC`SET`SPECIALTY [u(cobj,data)]=@attach [u(cobj,data)]/Do`SET`SPECIALTY=%0,elements(%1,2,|),%2;@select/inline t(%q<entry>)=1,{@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now has the [u(setr,have,ansi(h,u(capnames,%q<find>/%q<spec>)) Specialty at [ansi(h,%q<entry>)])] )},{You now have the %q<have>},{%q<msg>}},0,{@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) has lost the [u(setr,have,ansi(h,u(capnames,%q<find>/%q<spec>)) Specialty)] )},{You have lost the %q<have>},{%q<msg>}}
 
-&DO`VAL`SPECIALTY u(ex-cdo)=@check strlen(u(setr,enstat,before(%1,/)))=@pemit %#=u(RFN`MSGHEAD) ERROR: No stat entered to specialize in.;@attach u(ccs)/INC`PARTIAL=%q<enstat>,setunion(setunion(u(u(ex-cdo)/FUN`GET`ABILITIES),MARTIAL ARTS,|,i,|),u(u(ex-cdo)/FUN`GET`ATTRIBUTES),|,i,|),|,EDITCHAR,find,stat;@check strlen(u(setr,spec,after(%1,/)))=@pemit %#=u(RFN`MSGHEAD) ERROR: No Specialty name entered.;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check valnum(%q<entry>)=@pemit %#=u(RFN`MSGHEAD) ERROR: Specialty values must be integers.}
-&DO`SET`SPECIALTY u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`SPECIALTY;@select/inline t(%q<entry>)=0,{th delstat(%0/D`SPECIALTIES,ucstr(%q<find>/%q<spec>))},1,{th setstat(%0/D`SPECIALTIES,ucstr(%q<find>/%q<spec>),%q<entry>)}
+&DO`VAL`SPECIALTY [u(cobj,data)]=@check strlen(u(setr,enstat,before(%1,/)))=@attach %!/INC`MSG=ERROR: No stat entered to specialize in.;@attach u(ccs)/INC`PARTIAL=%q<enstat>,setunion(setunion(u([u(cobj,data)]/FUN`GET`ABILITIES),MARTIAL ARTS,|,i,|),u([u(cobj,data)]/FUN`GET`ATTRIBUTES),|,i,|),|,EDITCHAR,find,stat;@check strlen(u(setr,spec,after(%1,/)))=@attach %!/INC`MSG=ERROR: No Specialty name entered.;@select/inline t(strlen(u(setr,entry,%2)))=1,{@check u(valnum,%q<entry>)=@attach %!/INC`MSG=ERROR: Specialty values must be integers.}
+&DO`SET`SPECIALTY [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`SPECIALTY;@select/inline t(%q<entry>)=0,{th u(delstat,%0/D`SPECIALTIES,ucstr(%q<find>/%q<spec>))},1,{th u(setstat,%0/D`SPECIALTIES,ucstr(%q<find>/%q<spec>),%q<entry>)}
 
-&FUN`RET`SPECIALTIES u(ex-cdo)=iter(ucstr(get(%0/D`SPECIALTIES)),before(%i0,~),|,|)
+&FUN`RET`SPECIALTIES [u(cobj,data)]=iter(ucstr(get(%0/D`SPECIALTIES)),before(%i0,~),|,|)
 
 @@ Merits and Flaws
 
 
-&VAR`MERITS u(ex-cdo)=ALLIES|AMBIDEXTROUS|ARTIFACT|BACKING|BOUNDLESS ENDURANCE|COMMAND|CONTACTS|CULT|DANGER SENSE|DEMESNE|DIRECTION SENSE|EIDETIC MEMORY|FAMILIAR|FAST REFLEXES|FLEET OF FOOT|FOLLOWERS|GIANT|HEARTHSTONE|HIDEOUS|INFLUENCE|IRON STOMACH|LANGUAGE|MANSE|MENTOR|MARTIAL ARTIST|MIGHTY THEW|NATURAL IMMUNITY|PAIN TOLERANCE|QUICK DRAW|RETAINERS|RESOURCES|RESOURCES|SELECTIVE CONTRACEPTION|STRONG LUNGS|TEMPERED BY THE ELEMENTS|TOXIN RESISTANCE|CHAMELEON|CLAWS|FANGS|HOOVES|HORNS|ENHANCED SENSE|EXALTED HEALING|EXTRA LIMBS|GILLS|POISONED BODY|QUILLS|SUBTLETY|TAIL|THAUMATURGIST|UNUSUAL HIDE|VENOMOUS|WALL WALKING|WINGS
-&VAR`FLAWS u(ex-cdo)=ADDICTION|AMPUTEE|BLIND|DEAF|DERANGEMENT|MUTE|STERILE|WYLD MUTANT
+&VAR`MERITS [u(cobj,data)]=ALLIES|AMBIDEXTROUS|ARTIFACT|BACKING|BOUNDLESS ENDURANCE|COMMAND|CONTACTS|CULT|DANGER SENSE|DEMESNE|DIRECTION SENSE|EIDETIC MEMORY|FAMILIAR|FAST REFLEXES|FLEET OF FOOT|FOLLOWERS|GIANT|HEARTHSTONE|HIDEOUS|INFLUENCE|IRON STOMACH|LANGUAGE|MANSE|MENTOR|MARTIAL ARTIST|MIGHTY THEW|NATURAL IMMUNITY|PAIN TOLERANCE|QUICK DRAW|RETAINERS|RESOURCES|RESOURCES|SELECTIVE CONTRACEPTION|STRONG LUNGS|TEMPERED BY THE ELEMENTS|TOXIN RESISTANCE|CHAMELEON|CLAWS|FANGS|HOOVES|HORNS|ENHANCED SENSE|EXALTED HEALING|EXTRA LIMBS|GILLS|POISONED BODY|QUILLS|SUBTLETY|TAIL|THAUMATURGIST|UNUSUAL HIDE|VENOMOUS|WALL WALKING|WINGS
+&VAR`FLAWS [u(cobj,data)]=ADDICTION|AMPUTEE|BLIND|DEAF|DERANGEMENT|MUTE|STERILE|WYLD MUTANT
 
 @@ Native Charms
 
-&GFN`CHARMTYPE u(ex-cdo)=reswitchi(getsplat(%0),^(SOLAR|LUNAR|ABYSSAL|ALCHEMICAL|INFERNAL|TERRESTIAL|RAKSHA|SIDEREAL|GHOST|SPIRIT|MORTAL|JADEBORN)$,getsplat(%0),^(GOD-BLOODED)$,reswitchi(getstat(%0/D`INFO,Caste),^(Divine)$,Spirit,^(Demon)$,Spirit,^(Fae)$,Raksha,^(SOLAR|LUNAR|ABYSSAL|INFERNAL|SIDEREAL)$,getstat(%0/D`INFO,Caste),Mortal),MORTAL)
+&GFN`CHARMTYPE [u(cobj,data)]=reswitchi(u(getsphere,%0),^(SOLAR|LUNAR|ABYSSAL|ALCHEMICAL|INFERNAL|TERRESTIAL|RAKSHA|SIDEREAL|GHOST|SPIRIT|MORTAL|JADEBORN)$,u(getsphere,%0),^(GOD-BLOODED)$,reswitchi(u(getstat,%0/D`INFO,Caste),^(Divine)$,Spirit,^(Demon)$,Spirit,^(Fae)$,Raksha,^(SOLAR|LUNAR|ABYSSAL|INFERNAL|SIDEREAL)$,u(getstat,%0/D`INFO,Caste),Mortal),MORTAL)
 
-&INC`ADD`CHARM u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`CHARM=%0,charmtype(%0)/[elements(%1,2,|)],%2;@attach u(ex-cdo)/INC`ADD`CHARM`REPORT
-&INC`REM`CHARM u(ex-cdo)=@attach u(ex-cdo)/DO`REM`CHARM=%0,charmtype(%0)/[elements(%1,2,|)],%2;@attach u(ex-cdo)/INC`REM`CHARM`REPORT
+&INC`ADD`CHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`CHARM=%0,charmtype(%0)/[elements(%1,2,|)],%2;@attach [u(cobj,data)]/INC`ADD`CHARM`REPORT
+&INC`REM`CHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`CHARM=%0,charmtype(%0)/[elements(%1,2,|)],%2;@attach [u(cobj,data)]/INC`REM`CHARM`REPORT
 
-&INC`ADD`CHARM`REPORT u(ex-cdo)=@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now has the [u(setr,have,ansi(h,capnames(%q<find> %q<find2>)) Charms [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You now have the %q<have>},{%q<msg>}
-&INC`REM`CHARM`REPORT u(ex-cdo)=@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer have the [u(setr,have,ansi(h,capnames(%q<find> %q<find2>)) Charms: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You no longer have the %q<have>},{%q<msg>}
+&INC`ADD`CHARM`REPORT [u(cobj,data)]=@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now has the [u(setr,have,ansi(h,u(capnames,%q<find> %q<find2>)) Charms [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You now have the %q<have>},{%q<msg>}
+&INC`REM`CHARM`REPORT [u(cobj,data)]=@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer have the [u(setr,have,ansi(h,u(capnames,%q<find> %q<find2>)) Charms: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You no longer have the %q<have>},{%q<msg>}
 
-&INC`ADD`OCHARM u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`CHARM=%0,elements(%1,2,|)/[elements(%1,3,|)],%2;@attach u(ex-cdo)/INC`ADD`CHARM`REPORT
-&INC`REM`OCHARM u(ex-cdo)=@attach u(ex-cdo)/DO`REM`CHARM=%0,elements(%1,2,|)/[elements(%1,3,|)],%2;@attach u(ex-cdo)/INC`REM`CHARM`REPORT
+&INC`ADD`OCHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`CHARM=%0,elements(%1,2,|)/[elements(%1,3,|)],%2;@attach [u(cobj,data)]/INC`ADD`CHARM`REPORT
+&INC`REM`OCHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`CHARM=%0,elements(%1,2,|)/[elements(%1,3,|)],%2;@attach [u(cobj,data)]/INC`REM`CHARM`REPORT
 
-&DO`VAL`CHARM u(ex-cdo)=@check strlen(before(%1,/))=@pemit %#=u(RFN`MSGHEAD) ERROR: No Charmtype entered.;@attach u(ccs)/INC`PARTIAL=before(%1,/),u(u(ex-cdo)/FUN`GET`CHARMTYPES),|,v(VAR`MSGHEAD),find,charmtype;@check strlen(after(%1,/))=@pemit %#=u(RFN`MSGHEAD) ERROR: No Charm Category entered.;@attach u(ccs)/INC`PARTIAL=after(%1,/),u(u(ex-cdo)/FUN`GET`CHARMTYPES`%q<find>),|,v(VAR`MSGHEAD),find2,Charm Category;@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Charms entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@pemit %#=u(RFN`MSGHEAD) ERROR: Charm entries invalid.
-&DO`ADD`CHARM u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`CHARM;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`CHARMS`%q<find>`%q<find2>))),ucstr(%q<entry>),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You already have,name(%0) already has)] [ansi(h,capnames(%q<find> %q<find2>))] Charms [itemize(capnames(%q<conflict>),|,and,\,)].;&D`CHARMS`%q<find>`%q<find2> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
-&DO`REM`CHARM u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`CHARM;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`CHARMS`%q<find>`%q<find2>))),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You don't have have,name(%0) doesn't have)] [ansi(h,capnames(%q<find> %q<find2>))] Charms [itemize(capnames(%q<conflict>),|,and,\,)].;&D`CHARMS`%q<find>`%q<find2> %0=u(setr,newcharms,setdiff(get(%0/D`CHARMS`%q<find>`%q<find2>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`CHARMS`%q<find>`%q<find2>}
+&DO`VAL`CHARM [u(cobj,data)]=@check strlen(before(%1,/))=@attach %!/INC`MSG=ERROR: No Charmtype entered.;@attach u(ccs)/INC`PARTIAL=before(%1,/),u([u(cobj,data)]/FUN`GET`CHARMTYPES),|,v(VAR`MSGHEAD),find,charmtype;@check strlen(after(%1,/))=@attach %!/INC`MSG=ERROR: No Charm Category entered.;@attach u(ccs)/INC`PARTIAL=after(%1,/),u([u(cobj,data)]/FUN`GET`CHARMTYPES`%q<find>),|,v(VAR`MSGHEAD),find2,Charm Category;@check strlen(%2)=@attach %!/INC`MSG=ERROR: No Charms entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@attach %!/INC`MSG=ERROR: Charm entries invalid.
+&DO`ADD`CHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`CHARM;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`CHARMS`%q<find>`%q<find2>))),ucstr(%q<entry>),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You already have,name(%0) already has)] [ansi(h,u(capnames,%q<find> %q<find2>))] Charms [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`CHARMS`%q<find>`%q<find2> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
+&DO`REM`CHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`CHARM;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`CHARMS`%q<find>`%q<find2>))),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You don't have have,name(%0) doesn't have)] [ansi(h,u(capnames,%q<find> %q<find2>))] Charms [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`CHARMS`%q<find>`%q<find2> %0=u(setr,newcharms,setdiff(get(%0/D`CHARMS`%q<find>`%q<find2>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`CHARMS`%q<find>`%q<find2>}
 
-&FUN`GET`CHARMTYPES u(ex-cdo)=SOLAR|ABYSSAL|TERRESTRIAL|LUNAR|SIDEREAL|INFERNAL|SPIRIT
+&FUN`GET`CHARMTYPES [u(cobj,data)]=SOLAR|ABYSSAL|TERRESTRIAL|LUNAR|SIDEREAL|INFERNAL|SPIRIT
 
-&FUN`GET`CHARMTYPES`SOLAR u(ex-cdo)=u(FUN`GET`ABILITIES)
-&FUN`GET`CHARMTYPES`ABYSSAL u(ex-cdo)=u(FUN`GET`ABILITIES)
-&FUN`GET`CHARMTYPES`TERRESTRIAL u(ex-cdo)=u(FUN`GET`ABILITIES)
-&FUN`GET`CHARMTYPES`LUNAR u(ex-cdo)=u(FUN`GET`ATTRIBUTES)
-&FUN`GET`CHARMTYPES`SIDEREAL u(ex-cdo)=u(FUN`GET`ABILITIES)
-&FUN`GET`CHARMTYPES`INFERNAL u(ex-cdo)=u(FUN`GET`ABILITIES)
-&FUN`GET`CHARMTYPES`SPIRIT u(ex-cdo)=UNIVERSAL
+&FUN`GET`CHARMTYPES`SOLAR [u(cobj,data)]=u(FUN`GET`ABILITIES)
+&FUN`GET`CHARMTYPES`ABYSSAL [u(cobj,data)]=u(FUN`GET`ABILITIES)
+&FUN`GET`CHARMTYPES`TERRESTRIAL [u(cobj,data)]=u(FUN`GET`ABILITIES)
+&FUN`GET`CHARMTYPES`LUNAR [u(cobj,data)]=u(FUN`GET`ATTRIBUTES)
+&FUN`GET`CHARMTYPES`SIDEREAL [u(cobj,data)]=u(FUN`GET`ABILITIES)
+&FUN`GET`CHARMTYPES`INFERNAL [u(cobj,data)]=u(FUN`GET`ABILITIES)
+&FUN`GET`CHARMTYPES`SPIRIT [u(cobj,data)]=UNIVERSAL
 
-@@ &VAR`CHARMS`ALCHEMICAL u(ex-cdo)=COMBAT|SURVIVAL|SPEED_AND_MOBILITY|SOCIAL|STEALTH_AND_DISGUISE|ANALYTIC_AND_COGNITIVE|LABOR_AND_UTILITY|SUBMODULES|GENERAL|MASS_COMBAT|SPIRITUAL
-@@ &VAR`CHARMS`RAKSHA u(ex-cdo)=MASK|HEART|CUP|RING|STAFF|SWORD|WAY
-@@ &VAR`CHARMS`SPIRIT u(ex-cdo)=GENERAL|UNIVERSAL|AEGIS|BLESSINGS|CURSES|DIVINATIONS|DIVINE_WORKS|EDGES|EIDOLA|ENCHANTMENTS|INHABITINGS|RELOCATIONS|SENDINGS|TANTRA
-@@ &VAR`CHARMS`MORTAL u(ex-cdo)=UNIVERSAL
-@@ &VAR`CHARMS`GHOST u(ex-cdo)=UNIVERSAL
-@@ &VAR`CHARMS`JADEBORN u(ex-cdo)=FOUNDATION|WORKER|WARRIOR|ARTISAN|ENLIGHTENED|CHAOS
+@@ &VAR`CHARMS`ALCHEMICAL [u(cobj,data)]=COMBAT|SURVIVAL|SPEED_AND_MOBILITY|SOCIAL|STEALTH_AND_DISGUISE|ANALYTIC_AND_COGNITIVE|LABOR_AND_UTILITY|SUBMODULES|GENERAL|MASS_COMBAT|SPIRITUAL
+@@ &VAR`CHARMS`RAKSHA [u(cobj,data)]=MASK|HEART|CUP|RING|STAFF|SWORD|WAY
+@@ &VAR`CHARMS`SPIRIT [u(cobj,data)]=GENERAL|UNIVERSAL|AEGIS|BLESSINGS|CURSES|DIVINATIONS|DIVINE_WORKS|EDGES|EIDOLA|ENCHANTMENTS|INHABITINGS|RELOCATIONS|SENDINGS|TANTRA
+@@ &VAR`CHARMS`MORTAL [u(cobj,data)]=UNIVERSAL
+@@ &VAR`CHARMS`GHOST [u(cobj,data)]=UNIVERSAL
+@@ &VAR`CHARMS`JADEBORN [u(cobj,data)]=FOUNDATION|WORKER|WARRIOR|ARTISAN|ENLIGHTENED|CHAOS
 
 @@ Martial Arts Charms
 
-&INC`ADD`MACHARM u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`MACHARM;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,gained [ansi(h,u(u(ex-cdo)/FUN`GET`STYLENAME,%0,%q<slot>))] Charms: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) gained %q<have>}
+&INC`ADD`MACHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`MACHARM;@attach %!/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,gained [ansi(h,u([u(cobj,data)]/FUN`GET`STYLENAME,%0,%q<slot>))] Charms: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) gained %q<have>}
 
-&INC`REM`MACHARM u(ex-cdo)=@attach u(ex-cdo)/DO`REM`MACHARM;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,lost [ansi(h,u(u(ex-cdo)/FUN`GET`STYLENAME,%0,%q<slot>))] Charms: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) lost %q<have>}
+&INC`REM`MACHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`MACHARM;@attach %!/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,lost [ansi(h,u([u(cobj,data)]/FUN`GET`STYLENAME,%0,%q<slot>))] Charms: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) lost %q<have>}
 
-&DO`VAL`MACHARM u(ex-cdo)=@check strlen(%1)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Style entered.;@check words(u(setr,styles,u(u(ex-cdo)/FUN`RET`STYLES,%0)),|)=@pemit %#=u(RFN`MSGHEAD) ERROR: [switch(%0,%#,You don't,name(%0) doesn't)] know any styles.;@attach u(ccs)/INC`PARTIAL=%1,%q<styles>,|,v(VAR`MSGHEAD),style,style;th u(setq,slot,strfirstof(elements(first(wildgrepi(%0,D`CHARMS`MACHARMS`*`NAME,%q<style>)),4,`,`),nextslot(%0,D`CHARMS`MACHARMS)));@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Charms entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@pemit %#=u(RFN`MSGHEAD) ERROR: Charm entries invalid.
+&DO`VAL`MACHARM [u(cobj,data)]=@check strlen(%1)=@attach %!/INC`MSG=ERROR: No Style entered.;@check words(u(setr,styles,u([u(cobj,data)]/FUN`RET`STYLES,%0)),|)=@attach %!/INC`MSG=ERROR: [switch(%0,%#,You don't,name(%0) doesn't)] know any styles.;@attach u(ccs)/INC`PARTIAL=%1,%q<styles>,|,v(VAR`MSGHEAD),style,style;th u(setq,slot,strfirstof(elements(first(wildgrepi(%0,D`CHARMS`MACHARMS`*`NAME,%q<style>)),4,`,`),nextslot(%0,D`CHARMS`MACHARMS)));@check strlen(%2)=@attach %!/INC`MSG=ERROR: No Charms entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@attach %!/INC`MSG=ERROR: Charm entries invalid.
 
-&DO`ADD`MACHARM u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`MACHARM;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`CHARMS`MACHARMS`%q<slot>))),ucstr(%q<entry>),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You already have,name(%0) already has)] [u(u(ex-cdo)/FUN`RET`STYLENAME,%0,%q<slot>)] Charms [itemize(capnames(%q<conflict>),|,and,\,)].;&D`CHARMS`MACHARMS`%q<slot> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|));&D`CHARMS`MACHARMS`%q<slot>`NAME %0=ucstr(%q<style>)
+&DO`ADD`MACHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`MACHARM;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`CHARMS`MACHARMS`%q<slot>))),ucstr(%q<entry>),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You already have,name(%0) already has)] [u([u(cobj,data)]/FUN`RET`STYLENAME,%0,%q<slot>)] Charms [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`CHARMS`MACHARMS`%q<slot> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|));&D`CHARMS`MACHARMS`%q<slot>`NAME %0=ucstr(%q<style>)
 
-&DO`REM`MACHARM u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`MACHARM;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`CHARMS`MACHARMS`%q<slot>))),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You don't have have,name(%0) doesn't have)] [u(u(ex-cdo)/FUN`RET`STYLENAME,%0,%q<slot>)] Charms [itemize(capnames(%q<conflict>),|,and,\,)].;&D`CHARMS`MACHARMS`%q<slot> %0=u(setr,newcharms,setdiff(get(%0/D`CHARMS`MACHARMS`%q<slot>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`CHARMS`MACHARMS`%q<slot>}
+&DO`REM`MACHARM [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`MACHARM;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`CHARMS`MACHARMS`%q<slot>))),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You don't have have,name(%0) doesn't have)] [u([u(cobj,data)]/FUN`RET`STYLENAME,%0,%q<slot>)] Charms [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`CHARMS`MACHARMS`%q<slot> %0=u(setr,newcharms,setdiff(get(%0/D`CHARMS`MACHARMS`%q<slot>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`CHARMS`MACHARMS`%q<slot>}
 
-&FUN`GET`STYLES u(ex-cdo)=setdiff(v(VAR`STYLES),v(VAR`STYLES`BANNED),|,i,|)
+&FUN`GET`STYLES [u(cobj,data)]=setdiff(v(VAR`STYLES),v(VAR`STYLES`BANNED),|,i,|)
 
-&VAR`STYLES u(ex-cdo)=SNAKE STYLE|TIGER STYLE|SINGLE POINT SHINING INTO THE VOID STYLE|WHITE REAPER STYLE|EBON SHADOW STYLE|CRANE STYLE|SILVER-VOICED NIGHTINGALE STYLE|RIGHTEOUS DEVIL STYLE|BLACK CLAW STYLE|DREAMING PEARL COURTESAN STYLE|STEEL DEVIL STYLE
-&VAR`STYLES`BANNED u(ex-cdo)=
+&VAR`STYLES [u(cobj,data)]=SNAKE STYLE|TIGER STYLE|SINGLE POINT SHINING INTO THE VOID STYLE|WHITE REAPER STYLE|EBON SHADOW STYLE|CRANE STYLE|SILVER-VOICED NIGHTINGALE STYLE|RIGHTEOUS DEVIL STYLE|BLACK CLAW STYLE|DREAMING PEARL COURTESAN STYLE|STEEL DEVIL STYLE
+&VAR`STYLES`BANNED [u(cobj,data)]=
 
-&FUN`RET`STYLES u(ex-cdo)=iter(ucstr(get(%0/D`STYLES)),before(%i0,~),|,|)
-&FUN`RET`STYLENAME u(ex-cdo)=capnames(default(%0/D`CHARMS`MACHARMS`%1`NAME,Unnamed Style))
+&FUN`RET`STYLES [u(cobj,data)]=iter(ucstr(get(%0/D`STYLES)),before(%i0,~),|,|)
+&FUN`RET`STYLENAME [u(cobj,data)]=u(capnames,default(%0/D`CHARMS`MACHARMS`%1`NAME,Unnamed Style))
 
 @@ Evocations
-&INC`ADD`EVOCATION u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`EVOCATION=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,gained [ansi(h,u(u(ex-cdo)/FUN`RET`EVOCNAME,%0,%q<slot>))] Evocations: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) gained %q<have>}
+&INC`ADD`EVOCATION [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`EVOCATION=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,gained [ansi(h,u([u(cobj,data)]/FUN`RET`EVOCNAME,%0,%q<slot>))] Evocations: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) gained %q<have>}
 
-&INC`REM`EVOCATION u(ex-cdo)=@attach u(ex-cdo)/DO`REM`EVOCATION=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,lost [ansi(h,u(u(ex-cdo)/FUN`RET`EVOCNAME,%0,%q<slot>))] Evocations: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) lost %q<have>}
+&INC`REM`EVOCATION [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`EVOCATION=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{[ansi(h,name(%0))] [u(setr,have,lost [ansi(h,u([u(cobj,data)]/FUN`RET`EVOCNAME,%0,%q<slot>))] Evocations: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])]},{You %q<have>},{ansi(h,name(%0)) lost %q<have>}
 
-&DO`VAL`EVOCATION u(ex-cdo)=@check strlen(u(setr,style,%1))=@pemit %#=u(RFN`MSGHEAD) ERROR: No Style entered.;th u(setq,slot,strfirstof(elements(first(wildgrepi(%0,D`CHARMS`EVOCATIONS`*`NAME,%q<style>)),4,`,`),nextslot(%0,D`CHARMS`EVOCATIONS)));@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Charms entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@pemit %#=u(RFN`MSGHEAD) ERROR: Charm entries invalid.
+&DO`VAL`EVOCATION [u(cobj,data)]=@check strlen(u(setr,style,%1))=@attach %!/INC`MSG=ERROR: No Style entered.;th u(setq,slot,strfirstof(elements(first(wildgrepi(%0,D`CHARMS`EVOCATIONS`*`NAME,%q<style>)),4,`,`),nextslot(%0,D`CHARMS`EVOCATIONS)));@check strlen(%2)=@attach %!/INC`MSG=ERROR: No Charms entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@attach %!/INC`MSG=ERROR: Charm entries invalid.
 
-&DO`ADD`EVOCATION u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`EVOCATION;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`CHARMS`EVOCATIONS`%q<slot>))),ucstr(%q<entry>),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You already have,name(%0) already has)] [u(u(ex-cdo)/FUN`RET`EVOCATIONS,%0,%q<slot>)] Charms [itemize(capnames(%q<conflict>),|,and,\,)].;&D`CHARMS`EVOCATIONS`%q<slot> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|));&D`CHARMS`EVOCATIONS`%q<slot>`NAME %0=ucstr(%q<style>)
+&DO`ADD`EVOCATION [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`EVOCATION;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`CHARMS`EVOCATIONS`%q<slot>))),ucstr(%q<entry>),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You already have,name(%0) already has)] [u([u(cobj,data)]/FUN`RET`EVOCATIONS,%0,%q<slot>)] Charms [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`CHARMS`EVOCATIONS`%q<slot> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|));&D`CHARMS`EVOCATIONS`%q<slot>`NAME %0=ucstr(%q<style>)
 
-&DO`REM`EVOCATION u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`EVOCATION;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`CHARMS`EVOCATIONS`%q<slot>))),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You don't have have,name(%0) doesn't have)] [u(u(ex-cdo)/FUN`RET`EVOCNAME,%0,%q<slot>)] Charms [itemize(capnames(%q<conflict>),|,and,\,)].;&D`CHARMS`EVOCATIONS`%q<slot> %0=u(setr,newcharms,setdiff(get(%0/D`CHARMS`EVOCATIONS`%q<slot>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`CHARMS`EVOCATIONS`%q<slot>}
+&DO`REM`EVOCATION [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`EVOCATION;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`CHARMS`EVOCATIONS`%q<slot>))),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You don't have have,name(%0) doesn't have)] [u([u(cobj,data)]/FUN`RET`EVOCNAME,%0,%q<slot>)] Charms [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`CHARMS`EVOCATIONS`%q<slot> %0=u(setr,newcharms,setdiff(get(%0/D`CHARMS`EVOCATIONS`%q<slot>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`CHARMS`EVOCATIONS`%q<slot>}
 
-&FUN`RET`EVOCNAME u(ex-cdo)=capnames(default(%0/D`CHARMS`EVOCATIONS`%1`NAME,Unnamed Artifact))
+&FUN`RET`EVOCNAME [u(cobj,data)]=u(capnames,default(%0/D`CHARMS`EVOCATIONS`%1`NAME,Unnamed Artifact))
 
 @@ Health
 
-&INC`ADD`HEALTH u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`HEALTH;th u(setq,have,additional Health Levels: [sortby(u(ex-cdo)/FUN`HEALTHSORT,ucstr(%2))]);@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0)) has gained %q<have>},{You have gained %q<have>},{[ansi(h,name(%0))] has gained %q<have>}
+&INC`ADD`HEALTH [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`HEALTH;th u(setq,have,additional Health Levels: [sortby([u(cobj,data)]/FUN`HEALTHSORT,ucstr(%2))]);@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0)) has gained %q<have>},{You have gained %q<have>},{[ansi(h,name(%0))] has gained %q<have>}
 
-&INC`REM`HEALTH u(ex-cdo)=@attach u(ex-cdo)/DO`REM`HEALTH;th u(setq,have,Health Levels: [sortby(u(ex-cdo)/FUN`HEALTHSORT,ucstr(%2))]);@attach u(ex-cdo)/DO`ANNOUNCE=%0,{ansi(h,name(%0)) has lost %q<have>},{You have lost %q<have>},{[ansi(h,name(%0))] has lost %q<have>}
+&INC`REM`HEALTH [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`HEALTH;th u(setq,have,Health Levels: [sortby([u(cobj,data)]/FUN`HEALTHSORT,ucstr(%2))]);@attach %!/DO`ANNOUNCE=%0,{ansi(h,name(%0)) has lost %q<have>},{You have lost %q<have>},{[ansi(h,name(%0))] has lost %q<have>}
 
-&DO`VAL`HEALTH u(ex-cdo)=@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: Health levels field empty.;@check lmath(min,iter(ucstr(%2),or(isnum(%i0),regmatchi(%i0,^(I|D)$))))=@pemit %#=u(RFN`MSGHEAD) ERROR: %q<newhealth> contains an invalid value. Health values must be a negative number, I, or D.
-&DO`ADD`HEALTH u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`HEALTH;&D`HEALTH %0=sortby(u(ex-cdo)/FUN`HEALTHSORT,cat(get(%0/D`HEALTH),ucstr(%2)))
-&DO`REM`HEALTh u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`HEALTH;&D`HEALTH %0=sortby(u(ex-cdo)/FUN`HEALTHSORT,remove(get(%0/D`HEALTH),ucstr(%2)))
+&DO`VAL`HEALTH [u(cobj,data)]=@check strlen(%2)=@attach %!/INC`MSG=ERROR: Health levels field empty.;@check lmath(min,iter(ucstr(%2),or(isnum(%i0),regmatchi(%i0,^(I|D)$))))=@attach %!/INC`MSG=ERROR: %q<newhealth> contains an invalid value. Health values must be a negative number, I, or D.
+&DO`ADD`HEALTH [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`HEALTH;&D`HEALTH %0=sortby([u(cobj,data)]/FUN`HEALTHSORT,cat(get(%0/D`HEALTH),ucstr(%2)))
+&DO`REM`HEALTh [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`HEALTH;&D`HEALTH %0=sortby([u(cobj,data)]/FUN`HEALTHSORT,remove(get(%0/D`HEALTH),ucstr(%2)))
 
-&FUN`HEALTHSORT u(ex-cdo)=comp(u(FUN`HEALTHSORT`GET,%0),u(FUN`HEALTHSORT`GET,%1),N)
+&FUN`HEALTHSORT [u(cobj,data)]=comp(u(FUN`HEALTHSORT`GET,%0),u(FUN`HEALTHSORT`GET,%1),N)
 
-&FUN`HEALTHSORT`GET u(ex-cdo)=switch(%0,-0,1,-1,2,-2,3,-4,4,I,5,D,6)
+&FUN`HEALTHSORT`GET [u(cobj,data)]=switch(%0,-0,1,-1,2,-2,3,-4,4,I,5,D,6)
 
 @@ Spells
 
-&INC`ADD`SPELL u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`SPELL=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now has the [u(setr,have,ansi(h,capnames(%q<find>)) Spells [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You now have the %q<have>},{%q<msg>}
-&INC`REM`SPELL u(ex-cdo)=@attach u(ex-cdo)/DO`REM`SPELL=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer have the [u(setr,have,ansi(h,capnames(%q<find>)) Spells: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You no longer have the %q<have>},{%q<msg>}
+&INC`ADD`SPELL [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`SPELL=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now has the [u(setr,have,ansi(h,u(capnames,%q<find>)) Spells [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You now have the %q<have>},{%q<msg>}
+&INC`REM`SPELL [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`SPELL=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer have the [u(setr,have,ansi(h,u(capnames,%q<find>)) Spells: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You no longer have the %q<have>},{%q<msg>}
 
-&DO`VAL`SPELL u(ex-cdo)=@check strlen(%1)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Spell Category entered.;@attach u(ccs)/INC`PARTIAL=%1,u(u(ex-cdo)/FUN`GET`SPELLS),|,v(VAR`MSGHEAD),find,Spell Category;@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No Spells entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@pemit %#=u(RFN`MSGHEAD) ERROR: Spell entries invalid.
+&DO`VAL`SPELL [u(cobj,data)]=@check strlen(%1)=@attach %!/INC`MSG=ERROR: No Spell Category entered.;@attach u(ccs)/INC`PARTIAL=%1,u([u(cobj,data)]/FUN`GET`SPELLS),|,v(VAR`MSGHEAD),find,Spell Category;@check strlen(%2)=@attach %!/INC`MSG=ERROR: No Spells entered.;@check strlen(u(setr,entry,filterbool(#lambda/strlen(\%0),%2,|,|)))=@attach %!/INC`MSG=ERROR: Spell entries invalid.
 
-&DO`ADD`SPELL u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`SPELL;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`SPELLS`%q<find>))),ucstr(%q<entry>),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You already have,name(%0) already has)] [ansi(h,capnames(%q<find>))] Spells [itemize(capnames(%q<conflict>),|,and,\,)].;&D`SPELLS`%q<find> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
-&DO`REM`SPELL u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`SPELL;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`SPELLS`%q<find>))),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You don't have have,name(%0) doesn't have)] [ansi(h,capnames(%q<find>))] Spells [itemize(capnames(%q<conflict>),|,and,\,)].;&D`SPELLS`%q<find> %0=u(setr,newcharms,setdiff(get(%0/D`SPELLS`%q<find>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`SPELLS`%q<find>}
+&DO`ADD`SPELL [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`SPELL;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`SPELLS`%q<find>))),ucstr(%q<entry>),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You already have,name(%0) already has)] [ansi(h,u(capnames,%q<find>))] Spells [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`SPELLS`%q<find> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
+&DO`REM`SPELL [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`SPELL;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`SPELLS`%q<find>))),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You don't have have,name(%0) doesn't have)] [ansi(h,u(capnames,%q<find>))] Spells [itemize(u(capnames,%q<conflict>),|,and,\,)].;&D`SPELLS`%q<find> %0=u(setr,newcharms,setdiff(get(%0/D`SPELLS`%q<find>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`SPELLS`%q<find>}
 
-&FUN`GET`SPELLS u(ex-cdo)=setdiff(v(VAR`SPELLS),v(VAR`SPELLS`BANNED),|,i,|)
+&FUN`GET`SPELLS [u(cobj,data)]=setdiff(v(VAR`SPELLS),v(VAR`SPELLS`BANNED),|,i,|)
 
-&VAR`SPELLS u(ex-cdo)=TERRESTRIAL|CELESTIAL|SOLAR|SHADOWLANDS|LABYRINTH|VOID
-&VAR`SPELLS`BANNED u(ex-cdo)=
+&VAR`SPELLS [u(cobj,data)]=TERRESTRIAL|CELESTIAL|SOLAR|SHADOWLANDS|LABYRINTH|VOID
+&VAR`SPELLS`BANNED [u(cobj,data)]=
 
 @@ Favored
 
-&INC`ADD`FAVORED u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`FAVORED=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now [u(setr,have,[ansi(h,capnames(%q<find>))] Favors: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You now %q<have>},{%q<msg>}
-&INC`REM`FAVORED u(ex-cdo)=@attach u(ex-cdo)/DO`REM`FAVORED=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer [u(setr,have,[ansi(h,capnames(%q<find>))] Favor: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You no longer %q<have>},{%q<msg>}
+&INC`ADD`FAVORED [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`FAVORED=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now [u(setr,have,[ansi(h,u(capnames,%q<find>))] Favors: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You now %q<have>},{%q<msg>}
+&INC`REM`FAVORED [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`FAVORED=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer [u(setr,have,[ansi(h,u(capnames,%q<find>))] Favor: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You no longer %q<have>},{%q<msg>}
 
-&DO`VAL`FAVORED u(ex-cdo)=@check strlen(before(%1,/))=@pemit %#=u(RFN`MSGHEAD) ERROR: No Favored Type entered.;@attach u(ccs)/INC`PARTIAL=before(%1,/),u(u(ex-cdo)/FUN`GET`FAVORED),|,v(VAR`MSGHEAD),find,Favored Type;@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No [capnames(%q<find>)] entered.;th u(setq,find2,u(u(ex-cdo)/FUN`GET`FAVORED`%q<find>));th u(setq,entry,iter(ucstr(%2),grab(%q<find2>,if(strlen(%i0),%i0*),|),|,|));@check lmath(min,iter(%q<entry>,strlen(%i0),|,%b))=@pemit %#=u(RFN`MSGHEAD) ERROR: One or more [capnames(%q<find>)] didn't resolve. Please check your entry.
+&DO`VAL`FAVORED [u(cobj,data)]=@check strlen(before(%1,/))=@attach %!/INC`MSG=ERROR: No Favored Type entered.;@attach u(ccs)/INC`PARTIAL=before(%1,/),u([u(cobj,data)]/FUN`GET`FAVORED),|,v(VAR`MSGHEAD),find,Favored Type;@check strlen(%2)=@attach %!/INC`MSG=ERROR: No [u(capnames,%q<find>)] entered.;th u(setq,find2,u([u(cobj,data)]/FUN`GET`FAVORED`%q<find>));th u(setq,entry,iter(ucstr(%2),grab(%q<find2>,if(strlen(%i0),%i0*),|),|,|));@check lmath(min,iter(%q<entry>,strlen(%i0),|,%b))=@attach %!/INC`MSG=ERROR: One or more [u(capnames,%q<find>)] didn't resolve. Please check your entry.
 
-&DO`ADD`FAVORED u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`FAVORED;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`FAVORED`%q<find>))),ucstr(%q<entry>),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You already have,name(%0) already has)] the [itemize(capnames(%q<conflict>),|,and,\,)] [ansi(h,capnames(%q<find>))] Favored.;&D`FAVORED`%q<find> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
-&DO`REM`FAVORED u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`FAVORED;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`FAVORED`%q<find>))),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You don't have have,name(%0) doesn't have)] the [itemize(capnames(%q<conflict>),|,and,\,)] [ansi(h,capnames(%q<find>))] Favored.;&D`FAVORED`%q<find> %0=u(setr,newcharms,setdiff(get(%0/D`FAVORED`%q<find>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`FAVORED`%q<find>}
+&DO`ADD`FAVORED [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`FAVORED;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`FAVORED`%q<find>))),ucstr(%q<entry>),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You already have,name(%0) already has)] the [itemize(u(capnames,%q<conflict>),|,and,\,)] [ansi(h,u(capnames,%q<find>))] Favored.;&D`FAVORED`%q<find> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
+&DO`REM`FAVORED [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`FAVORED;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`FAVORED`%q<find>))),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You don't have have,name(%0) doesn't have)] the [itemize(u(capnames,%q<conflict>),|,and,\,)] [ansi(h,u(capnames,%q<find>))] Favored.;&D`FAVORED`%q<find> %0=u(setr,newcharms,setdiff(get(%0/D`FAVORED`%q<find>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`FAVORED`%q<find>}
 
-&FUN`GET`FAVORED u(ex-cdo)=ATTRIBUTES|ABILITIES
-&FUN`GET`FAVORED`ATTRIBUTES u(ex-cdo)=u(FUN`GET`ATTRIBUTES)
-&FUN`GET`FAVORED`ABILITIES u(ex-cdo)=u(FUN`GET`ABILITIES)
+&FUN`GET`FAVORED [u(cobj,data)]=ATTRIBUTES|ABILITIES
+&FUN`GET`FAVORED`ATTRIBUTES [u(cobj,data)]=u(FUN`GET`ATTRIBUTES)
+&FUN`GET`FAVORED`ABILITIES [u(cobj,data)]=u(FUN`GET`ABILITIES)
 
 @@ Supernal
 
-&INC`ADD`SUPERNAL u(ex-cdo)=@attach u(ex-cdo)/DO`ADD`SUPERNAL=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now [u(setr,have,[ansi(h,capnames(%q<find>))] Supernals: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You now %q<have>},{%q<msg>}
-&INC`REM`SUPERNAL u(ex-cdo)=@attach u(ex-cdo)/DO`REM`SUPERNAL=%0,elements(%1,2,|),%2;@attach u(ex-cdo)/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer [u(setr,have,[ansi(h,capnames(%q<find>))] Supernals: [itemize(iter(%q<entry>,ansi(h,capnames(%i0)),|,|),|,and,\,)])])},{You no longer %q<have>},{%q<msg>}
+&INC`ADD`SUPERNAL [u(cobj,data)]=@attach [u(cobj,data)]/DO`ADD`SUPERNAL=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) now [u(setr,have,[ansi(h,u(capnames,%q<find>))] Supernals: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You now %q<have>},{%q<msg>}
+&INC`REM`SUPERNAL [u(cobj,data)]=@attach [u(cobj,data)]/DO`REM`SUPERNAL=%0,elements(%1,2,|),%2;@attach %!/DO`ANNOUNCE=%0,{u(setr,msg,ansi(h,name(%0)) no longer [u(setr,have,[ansi(h,u(capnames,%q<find>))] Supernals: [itemize(iter(%q<entry>,ansi(h,u(capnames,%i0)),|,|),|,and,\,)])])},{You no longer %q<have>},{%q<msg>}
 
-&DO`VAL`SUPERNAL u(ex-cdo)=@check strlen(before(%1,/))=@pemit %#=u(RFN`MSGHEAD) ERROR: No Favored Type entered.;@attach u(ccs)/INC`PARTIAL=before(%1,/),u(u(ex-cdo)/FUN`GET`SUPERNAL),|,v(VAR`MSGHEAD),find,Favored Type;@check strlen(%2)=@pemit %#=u(RFN`MSGHEAD) ERROR: No [capnames(%q<find>)] entered.;th u(setq,find2,u(u(ex-cdo)/FUN`GET`SUPERNAL`%q<find>));th u(setq,entry,iter(ucstr(%2),grab(%q<find2>,if(strlen(%i0),%i0*),|),|,|));@check lmath(min,iter(%q<entry>,strlen(%i0),|,%b))=@pemit %#=u(RFN`MSGHEAD) ERROR: One or more [capnames(%q<find>)] didn't resolve. Please check your entry.
+&DO`VAL`SUPERNAL [u(cobj,data)]=@check strlen(before(%1,/))=@attach %!/INC`MSG=ERROR: No Favored Type entered.;@attach u(ccs)/INC`PARTIAL=before(%1,/),u([u(cobj,data)]/FUN`GET`SUPERNAL),|,v(VAR`MSGHEAD),find,Favored Type;@check strlen(%2)=@attach %!/INC`MSG=ERROR: No [u(capnames,%q<find>)] entered.;th u(setq,find2,u([u(cobj,data)]/FUN`GET`SUPERNAL`%q<find>));th u(setq,entry,iter(ucstr(%2),grab(%q<find2>,if(strlen(%i0),%i0*),|),|,|));@check lmath(min,iter(%q<entry>,strlen(%i0),|,%b))=@attach %!/INC`MSG=ERROR: One or more [u(capnames,%q<find>)] didn't resolve. Please check your entry.
 
-&DO`ADD`SUPERNAL u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`SUPERNAL;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`SUPERNAL`%q<find>))),ucstr(%q<entry>),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You already have,name(%0) already has)] the [itemize(capnames(%q<conflict>),|,and,\,)] [ansi(h,capnames(%q<find>))] as Supernal.;&D`SUPERNAL`%q<find> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
-&DO`REM`SUPERNAL u(ex-cdo)=@attach u(ex-cdo)/DO`VAL`SUPERNAL;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`SUPERNAL`%q<find>))),|,i,|)),|)=@pemit %#=u(RFN`MSGHEAD) [switch(%0,%#,You don't have have,name(%0) doesn't have)] the [itemize(capnames(%q<conflict>),|,and,\,)] [ansi(h,capnames(%q<find>))] as Supernal.;&D`SUPERNAL`%q<find> %0=u(setr,newcharms,setdiff(get(%0/D`SUPERNAL`%q<find>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`SUPERNAL`%q<find>}
+&DO`ADD`SUPERNAL [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`SUPERNAL;@stop words(u(setr,conflict,setinter(u(setr,oldcharms,ucstr(get(%0/D`SUPERNAL`%q<find>))),ucstr(%q<entry>),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You already have,name(%0) already has)] the [itemize(u(capnames,%q<conflict>),|,and,\,)] [ansi(h,u(capnames,%q<find>))] as Supernal.;&D`SUPERNAL`%q<find> %0=u(setr,newcharms,setunion(%q<oldcharms>,ucstr(%q<entry>),|,i,|))
+&DO`REM`SUPERNAL [u(cobj,data)]=@attach [u(cobj,data)]/DO`VAL`SUPERNAL;@stop words(u(setr,conflict,setdiff(ucstr(%q<entry>),u(setr,oldcharms,ucstr(get(%0/D`SUPERNAL`%q<find>))),|,i,|)),|)=@attach %!/INC`MSG=[switch(%0,%#,You don't have have,name(%0) doesn't have)] the [itemize(u(capnames,%q<conflict>),|,and,\,)] [ansi(h,u(capnames,%q<find>))] as Supernal.;&D`SUPERNAL`%q<find> %0=u(setr,newcharms,setdiff(get(%0/D`SUPERNAL`%q<find>),ucstr(%q<entry>),|,i,|));@select/inline strlen(%q<newcharms>)=0,{@wipe %0/D`SUPERNAL`%q<find>}
 
-&FUN`GET`SUPERNAL u(ex-cdo)=ATTRIBUTES|ABILITIES
-&FUN`GET`SUPERNAL`ATTRIBUTES u(ex-cdo)=u(FUN`GET`ATTRIBUTES)
-&FUN`GET`SUPERNAL`ABILITIES u(ex-cdo)=setunion(u(FUN`GET`ABILITIES),MARTIAL ARTS,|,i,|)
+&FUN`GET`SUPERNAL [u(cobj,data)]=ATTRIBUTES|ABILITIES
+&FUN`GET`SUPERNAL`ATTRIBUTES [u(cobj,data)]=u(FUN`GET`ATTRIBUTES)
+&FUN`GET`SUPERNAL`ABILITIES [u(cobj,data)]=setunion(u(FUN`GET`ABILITIES),MARTIAL ARTS,|,i,|)
 
 +shelp/addmain Characters/+editchar=+editchar is used to modify all parts of a character's +sheet!%R%R[ansi(h,+editchar/<flag> <player>|<categories|and|objects>\[=<modification>\])]%r%r[ansi(h,FLAG: SET)]%r[ansi(h,Splat)]%t%t=<splat>%r[ansi(h,Caste)]%T%T=<caste>%R[ansi(h,Essence)]%t%t=<value>%R[ansi(h,Willpower)]%t=<value>%R[ansi(h,Attribute)]%t<attribute>=<value>%r[ansi(h,Ability)]%t%t<ability>=<value>%r[ansi(h,Specialty)]%t<ability or attribute>/<specialty>=<value>%R[ansi(h,Style)]%t%t<style>=<value>%r[ansi(h,Craft)]%t%t<field>=<value> (Weaponsmithing, etc)%r%r[ansi(h,FLAG: ADD & REM)]%r[ansi(h,Charm)]%t%t<category>=<charm1>|<charm2>|etc (Native Charms)%r[ansi(h,MACharm)]%t%t<style>=<charm1>|<charm2>|etc (Martial Arts Charms)%r[ansi(h,Evocation)]%t<artifact>=<charm1>|<charm2>|etc (Evocations)%r[ansi(h,OCharm)]%t%t<splat>|<category>=<charm1>|<charm2>|etc (Cross-Splat Charms)%r[ansi(h,Spell)]%t%t<circle>=<spell1>|<spell2>|etc%r[ansi(h,Favored)]%t%t<Attribute/Ability>=<Item1>|<Item2>|etc%r[ansi(h,Supernal)]%t<Attribute/Ability>=<Item1>|<Item2>|etc%r[ansi(h,Health)]%t%t=<level1> <level2> etc (must be -0, -1, D, etc)%r%r[ansi(h,EXAMPLES)]%r%r[ansi(h,+editchar/set Isidoros|Attribute|Dexterity=4)]%r%tSets Isidoros' Dexterity to 4%r[ansi(h,+editchar/rem Isidoros|Health=-0 -1)]%r%tRemoves one -0 and one -1 from Isidoros' permanent Health Pool%R%R[ansi(h,CLEARING VALUES)]%RLeaves Values absolutely clear to remove them entirely! Example:%R+editchar/set Isidoros|Attribute|Dexterity=
\ No newline at end of file