Working albeit without requisites - see https://gist.github.com/alexhayes/118120bbfbb3828fc9f9
More fixes