Some more functionality all around.