Make it so. PR looks great though - happy to merge when you're done!