Madison/apiv1

update to new api