Major Update: merging in Epic changes/enhancements, adding/implementing a few additional ideas.