Fix followback, tests in progress