This commit is a final working version....