Clusterfuck savepoint

about to switch from runnables to threads