Added inital pass of endpoints (incomplete)