Continue fleshing out API