API stuff for Ryan/Aaron