major refactoring to integrate with latest stormbolt (storm-registry version)... will need thorough unit testing