Update to use fay-base.
Replace foo.x with ['foo'].
Added some stuff.