Some updates.  Not working currently...