Finishing touch to fix semantics.  UI could still use work.