Merge "wrap make and print success/failure message, more later"