Added expander, made error handling simpler
Added expander, made error handling simpler

Simpler but dumber... good enough though

garyb/fiction,CharlesAnthonyBrowne/fiction,CharlesAnthonyBrowne/fiction