adds api hosts
removed experimental code
cleaned up