Fleshed out API some more