Decent progress on conversion to web api, finish tomorrow