Fleshed out api some