needs

* fixing null pointer
* adding NONE need
* working on flock-building logic