version bump and basic functionality complete fro two directives