Refactor needs
Merge pull request #18 from dockyard/bc-refactor-needs

Refactor needs