Surprised that this isn't already done. This is a big feature