Working Version

Working version that may be ready to run
More Fixes