Fixes Issue #1 (closed) More (maybe bad) changes were needed than I anticipated, but should work now.