updated source.  Partially working now.