Shoot, still debugging.
Removed unecessary code that was inserted  to try to fix crash issues.