Simplify to get endpoints to work. Still not there