Refactoring, starting to add threading
Effects are now threaded