Yes, that's the direction we're going :)