Signed-off-by: Will Beason <willbeason@gmail.com>
Also add test to ensure functionality works. Signed-off-by: Will Beason <willbeason@gmail.com>