tryin got sort out tags and such
changing main endpoints