NSM-56, NSM-58 added dependencies in pom, merged code from branch that I forgot to last night