Move DB partially doen except for some effects that need lambdas