Almost finished with system for bp-of-flocking and local-flocking combined