Took on some customer porting work

Looks good, I like it.