Reorganizing code a bit.  Adding support for booleans.