Finish support for PUT, needs tidying