Seems some other pulls were made since I made this request, will merge them after people have had a chance to look at it.