Check this out in the new commit, I'm not sure if it's what you meant.