Moved controllers over to Q promises