Update sample grammars

9 files changed, 388 insertions, 125 deletions

diff --git a/RGens/data/sample-grammars/career.gram b/RGens/data/sample-grammars/career.gram
index 9dbac20..2e8851a 100644
--- a/RGens/data/sample-grammars/career.gram
+++ b/RGens/data/sample-grammars/career.gram
@@ -1,4 +1,16 @@
-[career-tech] paper pusher
+[career-tech] [act-career-tech]
+	[act-career-tech]
+	[career-prefix] [act-career-tech]
+	[career-prefix] [act-career-tech]
+	[career-tech2]
+	[career-tech2]
+
+[career-tech2] [career-prefix] [act-career-tech] (to the [career-tech] )
+	[career-prefix] [act-career-tech] (to the [career-tech] )
+	[career-prefix] [act-career-tech] (to the [career-tech] , [full-name-and-title] )
+	[career-prefix] [act-career-tech] (to [full-name-and-title] )
+
+[act-career-tech] paper pusher
 	computer programmer
 	sheet spreader
 	data entry [career-suffix]
@@ -20,12 +32,9 @@
 	internet [career-suffix]
 	network administrator
 	software design [career-suffix]
-	to the [career-tech]
 
 pragma initial-rule [career-tech]
 
-pragma prefix-with [career-tech] [career-prefix]
-
 [career-prefix] executive
 	assistant
 	junior
diff --git a/RGens/data/sample-grammars/college.gram b/RGens/data/sample-grammars/college.gram
index becbb3e..bf2a728 100644
--- a/RGens/data/sample-grammars/college.gram
+++ b/RGens/data/sample-grammars/college.gram
@@ -1,71 +1,121 @@
-[college-announcement] next [course-time] , [university] will offer ' [college-course] '
-	the [university] class ' [college-course] ' has been cancelled due to lack of interest
-	starting next year, incoming freshmen at [university] will be required to take ' [college-course] '
-	' [college-course] ' will no longer be offered at [university] due to lack of interest
-	' [college-course] ' is the most popular [course-level] class at [university]
-	due to overwhelming popularity, an additional section of ' [college-course] ' will be offered at [university] next semester
-	not one single student signed up for [university] 's ' [college-course] ' last semester
-	a [poll] of students at [university] revealed ' [college-course] ' is the [popular] popular [class-type] offered
+[college-announcement] next [course-time] , [university] will offer [quote-course]
+	the [university] class [quote-course] has been cancelled due to lack of interest
+	starting next [course-time] , incoming freshmen at [university] will be [required] to take [quote-course]
+	starting next [course-time] , incoming freshmen at [university] will no longer be [required] to take [quote-course]
+	students are [required] to take [quote-course]
+	students are no longer [required] to take [quote-course]
+	[quote-course] will no longer be offered at [university] due to [lack-reason]
+	[quote-course] is the most popular [course-level] class at [university]
+	due to overwhelming popularity, [add-sec] of [quote-course] will be offered at [university] next [course-time]
+	not one single student signed up for [plural-univ] [quote-course] last semester
+	a [poll] of students at [university] revealed [quote-course] is the [popular] popular [class-type] offered
+
+[plural-univ] [university] 's
+
+pragma despace-rule [plural-univ]
+
+[lack-reason] lack of interest
+	lack of teachers
+	lack of space
+
+[quote-course] ' [college-course] '
+
+pragma despace-rule [quote-course]
+pragma export-rule [quote-course]
+
+[required] required
+	strongly encouraged
+	strongly discouraged
+	forbidden
+
+[add-sec] an additional section
+	[2..6] additional sections
 
 pragma initial-rule [college-announcement]
 
 [course-time] fall
+	spring
+	winter
+	summer
 	year
 	semester
 
 [course-level] graduate
 	undergraduate
-	freshmen
+	[class-year]
 	liberal arts
 
+[class-year] freshmen
+	sophmore
+	junior
+	senior
+	super-senior
+
 [poll] poll
 	survey
 
 [popular] least
+	second-least
 	most
+	second-most
 
 [class-type] class
 	course
-
-[college-course] [course-adj] [course-noun] [course-suffix]
-	[course-adj] [course-noun] : [course-ending]
-	[course-adj] [course-noun] and [course-adj] [course-noun] [course-suffix]
-	[course-noun] and [course-noun] [course-suffix]
-	[course-group1] [course-group2] [course-life] [course-suffix]
-	[course-group2] [course-noun] [course-life] [course-suffix]
-	[course-group1] [course-group2] [course-life] since [1800..1970]
+	lecture
+	lab
+
+[course-adjnoun1] [course-prefixednoun]
+
+pragma prefix-with [course-adjnoun1] [course-adj]
+pragma prefix-with [course-adjnoun1] [course-adj]
+
+[course-adjnoun] [course-adjnoun1]
+	[course-adjnoun1]
+	[course-adjnoun1]
+	[course-adjnoun1]
+	[course-adjnoun1] and [course-adjnoun1]
+	[course-adjnoun1] , [course-adjnoun1] and [course-adjnoun1]
+	[course-adjnoun1] or [course-adjnoun1]
+	[course-adjnoun1] , [course-adjnoun1] or [course-adjnoun1]
+
+[college-course] [course-adjnoun] [course-suffix]
+	[course-adjnoun] : [course-ending]
+	[course-adjnoun] [course-suffix]
+	[course-group] [course-life] [course-suffix]
+	[course-group2] [course-adjnoun] [course-life] [course-suffix]
+	[course-group] [course-life] since [1500..2010]
 	[course-group2] [course-life] : [course-ending]
 	contemporary [course-group2] [course-life] and [course-life]
 	contemporary [course-group2] [course-life] : [course-ending]
-	transforming the [course-group1] [course-group2] experience
-	[course-prefix] [course-group1] [course-group2] [course-life]
+	transforming the [course-group] experience
+	[course-prefix] [course-group] [course-life]
 	[course-prefix] [course-group2] [course-life] [course-suffix]
-	[course-prefix] [course-adj] [course-noun] [course-suffix]
-	[course-prefix] the [course-group1] [course-group2] [course-movement] [course-suffix]
+	[course-prefix] [course-adjnoun] [course-suffix]
+	[course-prefix] the [course-group] [course-movement] [course-suffix]
 	[course-adj] [course-life] : [course-ending]
-	[course-adj] [course-noun] in modern [course-medium]
-	[course-noun] [course-suffix] : [course-ending]
-	[course-prefix] [course-noun] and [course-noun] [course-suffix]
-	the [course-adj] dimension of [course-group1] [course-group2] [course-medium]
+	[course-adjnoun] in modern [course-medium]
+	[course-adjnoun] [course-suffix] : [course-ending]
+	[course-prefix] [course-adjnoun] [course-suffix]
+	the [course-adj] dimension of [course-group] [course-medium]
 	[course-prefix] [course-topic] in [course-group2] [course-medium] : [course-ending]
 	[course-topic] and [course-topic] [course-suffix]
 	[course-group2] [course-medium] interpretation: [course-ending]
 	[course-group2] [course-medium] as a [course-adj] genre
-	[course-prefix] [course-group1] [course-group2] [course-medium]
-	[course-life] of [course-group2] [course-noun] : [course-ending]
+	[course-prefix] [course-group] [course-medium]
+	[course-life] of [course-group2] [course-adjnoun] : [course-ending]
 	[course-prefix] [course-popculture] : [course-ending]
 	[course-popculture] [course-suffix] : [course-ending]
-	[course-prefix] [course-adj] [course-noun] and [theory]
+	[course-prefix] [course-adjnoun] and [theory]
 	[course-prefix] [course-action] : [course-ending]
 	[course-action] [course-suffix] : [course-ending]
 	[course-prefix] [course-nounprefix] [course-ancient] [course-medium] : [course-ending]
-	ethnicity [course-suffix] : the [course-group1] [course-group2] [condition]
-	masterpieces of [course-group1] [course-group2] [course-medium]
+	ethnicity [course-suffix] : the [course-group] [condition]
+	masterpieces of [course-group] [course-medium]
 	[course-buzzword2] , [course-buzzword2] and [course-buzzword2] [course-suffix] : [course-ending]
 	[course-buzzword2] , [course-buzzword2] and [course-buzzword2] in [course-group2] [course-medium] : [course-ending]
 	[course-prefix] [course-event] : [course-ending]
-	[course-event] as [course-explored] in [course-group1] [course-group2] [course-medium]
-	[university-subject] as [course-explored] in [course-group1] [course-group2] [course-medium]
+	[course-event] as [course-explored] in [course-group] [course-medium]
+	[university-subject] as [course-explored] in [course-group] [course-medium]
 	[course-impactof] : [course-ending]
 	[course-static]
 	[course-static]
@@ -77,13 +127,13 @@ pragma export-rule [college-course]
 
 [course-static] [course-env1] : [course-prefix] [course-env2]
 	[course-prefix] [course-env3] : policy [course-suffix]
-	the meaning of life as [course-explored] in [course-group1] [course-group2] [course-medium]
+	the meaning of life as [course-explored] in [course-group] [course-medium]
 	the [course-impact] of [course-group2] [thinker-type] on [course-contemporary] [university-subject] : [course-ending]
 	the [rise] of [course-group2] [thinker-type] in [course-contemporary] [university-subject] : [course-ending]
 	[course-ancient] [course-medium] as the [roots] of [course-contemporary] [university-subject]
 	[course-buzzword2] , [course-buzzword2] and [course-buzzword2] as [course-explored] in [course-contemporary] [films] : [course-ending]
 	the history of [course-group2] [course-life] : [course-ending]
-	the [archetype] of the [quest] in [course-group1] [course-group2] [course-medium]
+	the [archetype] of the [quest] in [course-group] [course-medium]
 	[cross-cultural] [studies] [course-group2] [course-life]
 
 [course-event] the African diaspora
@@ -178,10 +228,10 @@ pragma export-rule [college-course]
 	Darwinism
 	activism
 	queer theory
-	[course-nounprefix] romanticism
-	[course-nounprefix] dadaism
-	[course-nounprefix] cubism
-	[course-nounprefix] realism
+	romanticism
+	dadaism
+	cubism
+	realism
 	paganism
 	homosexuality
 	sexuality
@@ -191,10 +241,20 @@ pragma export-rule [college-course]
 	intellectualism
 	multiculturalism
 
-[course-nounprefix] post-
-	pre-
-	early
+pragma prefix-with [course-noun] [course-nounprefix]
+
+[course-prefixednoun] [course-noun]
+	post- [course-noun]
+	pre- [course-noun]
+
+pragma despace-rule [course-prefixednoun]
+
+[course-nounprefix] early
+	middle
+	late
 	classical
+	historical
+	modern
 
 [course-adj] progressive
 	liberal
@@ -260,7 +320,7 @@ pragma export-rule [college-course]
 	critical issues facing the [course-contemporary] [course-person]
 	a process approach
 	[course-buzzword] , [course-buzzword] and [course-buzzword]
-	a [course-metaphor] of [course-noun] [course-suffix]
+	a [course-metaphor] of [course-adjnoun] [course-suffix]
 	a [course-metaphor] of [course-ancient] [course-suffix]
 	a [course-metaphor] [course-explored] in American [course-medium]
 	a [course-metaphor] [course-explored] in [course-contemporary] [course-medium]
@@ -296,6 +356,16 @@ pragma export-rule [college-course]
 [study] study
 	approach
 
+[course-group] [course-group1] [course-group2]
+	[course-group1] [course-group2]
+	[course-group1] [course-group2]
+	[course-group1] [course-group2]
+	[quote-political]
+
+[quote-political] " [org-political] "
+
+pragma despace-rule [quote-political]
+
 [course-group1] gay and lesbian
 	homosexual
 	bisexual
@@ -504,11 +574,11 @@ pragma export-rule [college-course]
 	21st century
 	20th century
 
-[course-impactof] the [course-impact] of [course-ancient] [course-medium] on [course-group1] [course-group2] [course-medium] [course-suffix]
+[course-impactof] the [course-impact] of [course-ancient] [course-medium] on [course-group] [course-medium] [course-suffix]
 	the [course-impact] of [course-ancient] [course-medium] on [course-contemporary] [university-subject]
-	the [course-impact] of [course-ancient] [course-medium] on [course-contemporary] [course-adj] [course-noun]
-	the [course-impact] of [course-group1] [course-group2] [course-medium] on [course-contemporary] [course-adj] [course-noun]
-	the [course-impact] of [course-group1] [course-group2] [course-medium] on [university-subject]
+	the [course-impact] of [course-ancient] [course-medium] on [course-contemporary] [course-adjnoun]
+	the [course-impact] of [course-group] [course-medium] on [course-contemporary] [course-adjnoun]
+	the [course-impact] of [course-group] [course-medium] on [university-subject]
 
 [course-impact] impact
 	effect
@@ -536,6 +606,7 @@ pragma export-rule [university]
 
 [university-subject] [hard-science]
 	[soft-science]
+	[college-major-tech]
 
 [hard-science] quantum mechanics
 	planar geometry
diff --git a/RGens/data/sample-grammars/computer.gram b/RGens/data/sample-grammars/computer.gram
index 58405e3..a3a7814 100644
--- a/RGens/data/sample-grammars/computer.gram
+++ b/RGens/data/sample-grammars/computer.gram
@@ -33,9 +33,12 @@
 	[esoteric-language]
 
 [esoteric-language] magenta
+	brainfuck
+	whitespace
+	befunge
+	malbolge
 
 pragma export-rule [computer-language]
-pragma export-rule [esoteric-language]
 pragma export-rule [computer-skill]
 
 [computer-skill] html
diff --git a/RGens/data/sample-grammars/names.gram b/RGens/data/sample-grammars/names.gram
index 2dd2e25..f9af073 100644
--- a/RGens/data/sample-grammars/names.gram
+++ b/RGens/data/sample-grammars/names.gram
@@ -1,3 +1,7 @@
+# @TODO 10/26/17 Ben Culkin :NameTypes
+#	Add rules for producing names in the common 'last, first' style format,
+#	as well as producing actual middle names/nick names for people
+
 [full-name] [first-name]
 	[last-name]
 	[first-name] [last-name]
@@ -25,6 +29,7 @@ pragma export-rule [random-name]
 	[female-title] [first-name-female] [last-name]
 	[female-title] [first-name-female] [middle-initial] . [last-name]
 	[gender-neutral-title] [full-name]
+	[generic-title] [full-name]
 	[full-name]
 
 [generic-title] [male-title]
diff --git a/RGens/data/sample-grammars/organization.gram b/RGens/data/sample-grammars/organization.gram
index d3205bc..15057c3 100644
--- a/RGens/data/sample-grammars/organization.gram
+++ b/RGens/data/sample-grammars/organization.gram
@@ -1,19 +1,39 @@
+[organization-desc] [org-political]
+
+[org-postfix] (allies of [org-political] )
+	(enemies of [org-political] )
+	(secretly opposed to [org-political] )
+	(secretly in cohorts with [org-political] )
+	(based in [city] )
+	(based in [town-name] )
+
+pragma suffix-with [organization-desc] [org-postfix]
+pragma suffix-with [organization-desc] [org-postfix]
+pragma suffix-with [organization-desc] [org-postfix]
+
 [organization] [org-political]
 
 pragma initial-rule [organization]
 pragma export-rule [org-political]
 
-[org-political] [org-prefix] [org-body] [org-goal]
+[org-political] [org-prefix] [org-body]
 
-[org-body] of [org-members] [org-position]
-	of [org-members] [org-position]
-	of [org-members] [org-position]
-	of [org-members] [org-position]
-	of [org-members] [org-position]
-	of [org-members] [org-position]
-	of [org-members] [org-position]
-	of [org-members] [org-position]
-	for
+pragma suffix-with [org-political] [org-goalbody]
+
+[org-body] of [org-members]
+
+[org-goalbody] [org-position] [org-goal]
+	for [org-goal]
+
+pragma suffix-with [org-goalbody] [org-wayof]
+
+[org-wayof] by way of [org-goal]
+	by [org-positioning] [org-goal]
+
+[org-positioning] supporting
+	abolishing
+	repealing
+	eliminating
 
 [org-position] for
 	for
@@ -66,10 +86,23 @@ pragma export-rule [org-political]
 	using [bad-thing] in public
 	wealth redistribution
 	wearing baseball caps backwards
-	[org-goal-abolish] miranda rights
-	[org-goal-abolish] speed limits
-	[org-goal-abolish] the [protect]
-	[org-goal-abolish] women's suffrage
+	miranda rights
+	speed limits
+	the [protect]
+	women's suffrage
+	[trademark+drug]
+	[organization]
+	offering [quote-course] in college
+	making [quote-course] a mandatory course
+	teaching [quote-course] in high school
+
+[org-goal-person] supporting [full-name-and-title]
+	opposing [full-name-and-title]
+	exiling [full-name-and-title]
+	indicting [full-name-and-title]
+	pardoning [full-name-and-title]
+
+pragma prefix-with [org-goal] [org-goal-abolish]
 
 [wealth] poor
 	working poor
@@ -105,7 +138,7 @@ pragma export-rule [org-political]
 	eliminating
 
 [org-prefix] council
-	[intl-name] association
+	association
 	organization
 	united organization
 	union
@@ -120,8 +153,22 @@ pragma export-rule [org-political]
 [intl-name] american
 	national
 	international
+	[intl-possesive]
+	[us-stateadj]
+
+[intl-possesive] [full-name-and-title] 's
+
+pragma despace-rule [intl-possesive]
+
+pragma prefix-with [org-prefix] [org-members-prefix]
+pragma prefix-with [org-prefix] [intl-name]
+pragma prefix-with [org-prefix] [org-members-prefix]
+
+[org-members] [org-members-body]
 
-[org-members] [org-members-prefix] [org-members-body]
+pragma prefix-with [org-members] [org-members-prefix]
+pragma prefix-with [org-members] [intl-name]
+pragma prefix-with [org-members] [org-members-prefix]
 
 [org-members-prefix] radical
 	concerned
diff --git a/RGens/data/sample-grammars/part-creature.gram b/RGens/data/sample-grammars/part-creature.gram
index d729e44..7d145b5 100755
--- a/RGens/data/sample-grammars/part-creature.gram
+++ b/RGens/data/sample-grammars/part-creature.gram
@@ -1,9 +1,13 @@
-[full-creature] [creature-choice]
+[full-creature] a(n) [creature-choice]
+	a(n) [creature-choice] fused with a(n) [creature-choice]
+	chimera of a(n) [creature-choice] , a(n) [creature-choice] and a [creature-choice]
 
 [creature-choice] [creature]
-	[characteristic] [creature]
-	[ability] [creature]
-	[ability] [characteristic] [creature]
+
+pragma prefix-with [creature-choice] [characteristic]
+pragma prefix-with [creature-choice] [ability]
+pragma prefix-with [creature-choice] [characteristic]
+pragma prefix-with [creature-choice] [ability]
 
 pragma initial-rule [full-creature]
 
@@ -16,10 +20,11 @@ pragma initial-rule [full-creature]
 	swallow whole
 	poisonous
 	regenerating
-	fire breathing
+	fire-breathing
 	anti-magic
 	petrifying
 	soul-eating
+	[eating]
 	frightful presence
 	confusing
 	flesh grinding
@@ -29,6 +34,14 @@ pragma initial-rule [full-creature]
 	nauseating
 	[ability] and [ability]
 
+[eating] [characteristic] -eating
+	[creature] -eating
+
+pragma despace-rule [eating]
+
+# @TODO 10/26/17 Ben Culkin :CharacteristicAdditions
+# 	Add more templates and classes to the list
+
 [characteristic] zombie
 	vampire
 	swarm
@@ -36,20 +49,30 @@ pragma initial-rule [full-creature]
 	barbarian
 	wizard
 	ninja
-	were [characteristic]
+	[were]
 	robot
 	rabid
 	demonic
 	awakened
 	feral
 	pirate
-	half-dragon
+	[partial-breed]
 	gelatinous
 	dire
 	shadow
 	rich
 	[characteristic] and [characteristic]
 
+[were] were- [characteristic]
+	were- [creature]
+
+pragma despace-rule [were]
+
+[partial-breed] half- [creature]
+	quarter- [creature]
+
+pragma despace-rule [partial-breed]
+
 [creature] shark
 	bear
 	lion
@@ -63,15 +86,33 @@ pragma initial-rule [full-creature]
 	crocodile
 	bee
 	spider
+	dragon
 	[elemental]
-	mimic
+	[dungeon-mimic]
 	dire penguin
 	giant mini space hamster
 	camel
 	little girl
 	classy kobold
+	disenchanter
+	[^creature]
+	[humanoid]
+	[creature-epic]
+
+[dungeon-mimic] trapper
+	mimic
+	lurker
+	cloaker
 
-[elemental] fire
+[elemental] [elemental-type] elemental
+
+[elemental-type] fire
 	earth
 	water
 	air
+	[paraquasi-elemental]
+
+[paraquasi-elemental] [elemental-type]
+
+# @TODO 10/26/17 Ben Culkin :ParaQuasiElementals
+# 	Add para/quasi elementals
diff --git a/RGens/data/sample-grammars/school.gram b/RGens/data/sample-grammars/school.gram
index edce444..cd9298b 100644
--- a/RGens/data/sample-grammars/school.gram
+++ b/RGens/data/sample-grammars/school.gram
@@ -1,7 +1,6 @@
 [public-school-fullname] [public-school] [school-type]
 
 pragma initial-rule [public-school-fullname]
-pragma export-rule [public-school]
 
 [school-type] high school
 	middle school
diff --git a/RGens/data/sample-grammars/superhero.gram b/RGens/data/sample-grammars/superhero.gram
index 7f6e89a..cdb609f 100755
--- a/RGens/data/sample-grammars/superhero.gram
+++ b/RGens/data/sample-grammars/superhero.gram
@@ -2,12 +2,40 @@
 
 pragma initial-rule [superhero-desc]
 
-pragma suffix-with [superhero-desc] [superhero-ally]
-pragma suffix-with [superhero-desc] [superhero-enemy]
+[superhero-postfix] [superhero-ally]
+	[superhero-enemy]
+
+pragma suffix-with [superhero-desc] [superhero-postfix]
+pragma suffix-with [superhero-desc] [superhero-postfix]
+pragma suffix-with [superhero-desc] [superhero-postfix]
+
+pragma suffix-with [superhero-desc] [superhero-secret]
+
+pragma suffix-with [superhero-desc] [superhero-org]
+pragma suffix-with [superhero-desc] [superhero-org]
 
 [superhero-ally] (ally of [superhero-name] )
+	(secret ally of [superhero-name] )
+	(lover of [superhero-name] )
 
 [superhero-enemy] (enemy of [superhero-name] )
+	(secret enemy of [superhero-name] )
+
+[superhero-misc] (betrayer of [superhero-name] )
+	(killer of [superhero-name] )
+	(defeater of [superhero-name] )
+	(mentor of [superhero-name] )
+	(subordinate of [superhero-name] )
+	( [generic-title] )
+
+[superhero-secret] (secret identity of [full-name-and-title] )
+
+[superhero-org] (member of the [organization] )
+	(double agent for the [organization] )
+	(sworn enemy of the [organization] )
+	(leader of the [organization] )
+	(second in command of the [organization] )
+	( [generic-title] of the [organization] )
 
 [superhero-name] [first-part] [second-part]
 	[second-part] [first-part]
@@ -112,6 +140,8 @@ pragma suffix-with [fifth-part] [fourth-part]
 
 [third-part] ,The [third-part2]
 
+pragma suffix-with [third-part] [fifth-part]
+
 [third-part2] [third-part-act]
 	[third-part-act] [second-part]
 
diff --git a/RGens/data/sample-grammars/web.gram b/RGens/data/sample-grammars/web.gram
index 52d2152..357fc36 100644
--- a/RGens/data/sample-grammars/web.gram
+++ b/RGens/data/sample-grammars/web.gram
@@ -1,3 +1,6 @@
+[generic-email] [email]
+	[fake-email]
+
 [email] [actual+email]
 
 [fake-email] [actual+fake-email]
@@ -6,52 +9,87 @@
 
 [url] [actual+url]
 
-pragma initial-rule [email]
+pragma initial-rule [generic-email]
 
+pragma export-rule [email]
 pragma export-rule [fake-email]
 pragma export-rule [username]
 pragma export-rule [domain-name]
 pragma export-rule [url]
 pragma export-rule [big-tld]
 
-[actual+email] [username] @ [subdomain-name] . [domain]
-	[username] @mail. [domain]
-	[username] @ [domain]
-	[username] @ [domain]
-	[acronym] @ [domain]
-	[email-alias] @ [domain]
-	[email-alias] @ [subdomain-name] . [domain]
-	[username] @ [subdomain-name] . [town-name] .net
-	[first-name] @ [last-name] .com
-	[first-name] @ [first-last] . [big-tld]
-
-[first-last] [first-name]
-	[first-name] - [last-name]
-
-[actual+fake-email] [username] @ [subdomain-name] . [fake-domain]
-	[username] @mail. [fake-domain]
-	[acronym] @ [fake-domain]
-	[email-alias] @ [fake-domain]
-	[email-alias] @ [subdomain-name] . [fake-domain]
+[actual+email] [email-initial] @ [email-trailing]
 
-[email-alias] webmaster
-	abuse
+[email-initial] [username]
+	[acronym]
+	[email-alias]
+	[full-name]
+	[username]
+	[acronym]
+	[email-alias]
+	[full-name]
+	[subdomain-name]
+	[email-misc]
+	[email-initial] + [email-initial]
+
+[email-trailing] [subdomain-name] . [domain]
+	mail. [domain]
+	[domain]
+	[subdomain-name] - [town-name] . [tld]
+	[last-name] . [tld]
+	[first-name] . [tld]
+	[last-name] - [first-name] . [tld]
+	[first-name] - [last-name] . [tld]
+
+[actual+fake-email] [email-initial] @ [fake-trailing]
+
+[fake-trailing] [subdomain-name] . [fake-domain]
+	[fake-domain]
+
+[email-alias] abuse
+	admin
+	administrator
+	billing
+	blog
+	ceo
+	cfo
+	contact
+	coo
+	cto
+	customer
+	customerservice
+	dnsadmin
+	dnsmaster
+	email
+	ftp
+	help
+	helpdesk
 	hostmaster
+	info
+	ipadmin
+	mail
+	mailer-daemon
+	marketing
+	marketingscum
+	news
+	nobody
+	noc
+	no-reply
 	postman
-	webjockey
-	email
+	postmaster
+	root
 	sales
+	security
+	ssladmin
 	support
-	marketingscum
-	mail
-	root
+	usenet
+	webjockey
+	webmaster
+	www
 
-[actual+username] [random-name]
-	[middle-initial] [random-name]
-	[middle-initial] [last-name]
+[actual+username] [full-name]
 	[first-name] . [last-name]
-	[first-name]
-	[random-name] [1..999]
+	[full-name] [1..999]
 
 [actual+url] http://www. [domain] /
 	http://www. [domain] /
@@ -59,15 +97,27 @@ pragma export-rule [big-tld]
 	http://www. [last-name] . [tld] /
 	http:// [username] . [domain] / 
 	[url-with-path]
+	[url-with-path]
 
-[url-with-path] http://www.geocities.com/ [neighborhood] / [digit-nonzero] [digit] [digit] [digit] /
-	http:// [url-begin] . [acronym] .net/ [url-username] /
-	http:// [url-begin] . [town-name] .net/ [url-username]
-	http:// [subdomain-name] . [acronym] .net/ [url-username]
-	http:// [subdomain-name] . [town-name] .net/ [url-username]
-	http:// [subdomain-name] . [last-name] . [big-tld] / [url-username]
-	http:// [username] . [acronym] .net/
-	http:// [username] . [url-state] [us-postalstate] .edu/
+[url-with-path] [url-protocol] :// www.geocities.com/ [neighborhood] / [digit-nonzero] [digit] [digit] [digit] /
+	[url-protocol] :// [url-begin] . [acronym] .net/ [url-username] /
+	[url-protocol] :// [url-begin] . [town-name] .net/ [url-username]
+	[url-protocol] :// [subdomain-name] . [acronym] .net/ [url-username]
+	[url-protocol] :// [subdomain-name] . [town-name] .net/ [url-username]
+	[url-protocol] :// [subdomain-name] . [last-name] . [big-tld] / [url-username]
+	[url-protocol] :// [username] . [acronym] .net/
+	[url-protocol] :// [username] . [url-state] [us-postalstate] .edu/
+	[freshmeat-url]
+
+[url-protocol] http
+	http
+	https
+	https
+	ftp
+	ssh
+	rsync
+	gopher
+	git
 
 [neighborhood] siliconvalley
 	heartland
@@ -150,12 +200,8 @@ pragma export-rule [big-tld]
 	net
 	org
 
-[subdomain-name] venus
-	mars
-	jupiter
-	pluto
-	saturn
-	neptune
+[subdomain-name] [planet]
+	[planet]
 	mail
 	www2
 	www [digit]
@@ -167,3 +213,15 @@ pragma export-rule [big-tld]
 	[first-name]
 	[last-name]
 	[acronym]
+	[email-misc]
+	[email-initial]
+	[subdomain-name] - [subdomain-name]
+
+[email-misc] 
+	[us-stateadj]
+	[town-name]
+	[complete-many-things]
+	[major-arcana]
+	[trademark+drug]
+	[trademark]
+	[city]