Moved amd additions into grunt