initial wicked implementation
pull in master branch and fix merge conflicts