[stable6][WIP] Move Flock basics into stable6