Added delegates and stuff