Fixed up endpoint templates. Still have a lot to go