I know Erik, but this should be merged. Thanks for the code review!