Whoops again
Made things cleaner regarding Endpoints class and extracting those endpoints