Fleshed out the api a bit more…