diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
index a154043ad..c96cef520 100644
--- a/src/app/(auth)/layout.tsx
+++ b/src/app/(auth)/layout.tsx
@@ -1,5 +1,6 @@
 import styles from './layout.module.scss'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import React from 'react'
 
 type PropTypes = {
@@ -14,7 +15,14 @@ export default function AuthLayout({ children }: PropTypes) {
                     {children}
                 </div>
                 <div className={styles.image}>
-                    <SpecialCmsImage special="AUTH_ICON" alt="en kappemann sin hatt" width={200}/>
+                    <SpecialCmsImage
+                        special="AUTH_ICON"
+                        alt="en kappemann sin hatt"
+                        width={200}
+                        //TODO: Probably call through other service see comments in frontpage operations
+                        readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                        updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                    />
                 </div>
             </div>
         </div>
diff --git a/src/app/(home)/InfoBubbles.module.scss b/src/app/(frontpage)/InfoBubbles.module.scss
similarity index 100%
rename from src/app/(home)/InfoBubbles.module.scss
rename to src/app/(frontpage)/InfoBubbles.module.scss
diff --git a/src/app/(home)/InfoBubbles.tsx b/src/app/(frontpage)/InfoBubbles.tsx
similarity index 100%
rename from src/app/(home)/InfoBubbles.tsx
rename to src/app/(frontpage)/InfoBubbles.tsx
diff --git a/src/app/(home)/LoggedIn.module.scss b/src/app/(frontpage)/LoggedIn.module.scss
similarity index 100%
rename from src/app/(home)/LoggedIn.module.scss
rename to src/app/(frontpage)/LoggedIn.module.scss
diff --git a/src/app/(home)/LoggedIn.tsx b/src/app/(frontpage)/LoggedIn.tsx
similarity index 87%
rename from src/app/(home)/LoggedIn.tsx
rename to src/app/(frontpage)/LoggedIn.tsx
index ee6f13126..1559f941d 100644
--- a/src/app/(home)/LoggedIn.tsx
+++ b/src/app/(frontpage)/LoggedIn.tsx
@@ -10,6 +10,7 @@ import { unwrapActionReturn } from '@/app/redirectToErrorPage'
 import { readNewsCurrentAction } from '@/services/news/actions'
 import { readActiveJobAdsAction } from '@/services/career/jobAds/actions'
 import { readCurrentEventsAction } from '@/services/events/actions'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import { faAngleDown } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
@@ -28,7 +29,12 @@ export default async function LoggedInLandingPage() {
             <div className={`${styles.part} ${styles.frontImg}`}>
                 <div className={styles.frontInfo}>
                     <div>
-                        <SpecialCmsImage special="FRONTPAGE_LOGO" width={300} />
+                        <SpecialCmsImage
+                            special="FRONTPAGE_LOGO"
+                            width={300}
+                            readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                            updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                        />
                         <div className={styles.socials}>
                             <SocialIcons />
                         </div>
diff --git a/src/app/(home)/LoggedInSection.module.scss b/src/app/(frontpage)/LoggedInSection.module.scss
similarity index 100%
rename from src/app/(home)/LoggedInSection.module.scss
rename to src/app/(frontpage)/LoggedInSection.module.scss
diff --git a/src/app/(home)/LoggedInSection.tsx b/src/app/(frontpage)/LoggedInSection.tsx
similarity index 100%
rename from src/app/(home)/LoggedInSection.tsx
rename to src/app/(frontpage)/LoggedInSection.tsx
diff --git a/src/app/(home)/LoggedOut.tsx b/src/app/(frontpage)/LoggedOut.tsx
similarity index 82%
rename from src/app/(home)/LoggedOut.tsx
rename to src/app/(frontpage)/LoggedOut.tsx
index e4965423c..e0d176436 100644
--- a/src/app/(home)/LoggedOut.tsx
+++ b/src/app/(frontpage)/LoggedOut.tsx
@@ -5,6 +5,7 @@ import MazeMap from '@/components/MazeMap/MazeMap'
 import SocialIcons from '@/components/SocialIcons/SocialIcons'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
 import YouTube from '@/components/YouTube/YouTube'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import { faAngleDown } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
@@ -15,7 +16,12 @@ export default async function LoggedOutLandingPage() {
             <div className={`${styles.part} ${styles.frontImg}`}>
                 <div className={styles.frontInfo}>
                     <div>
-                        <SpecialCmsImage special="FRONTPAGE_LOGO" width={300}/>
+                        <SpecialCmsImage
+                            special="FRONTPAGE_LOGO"
+                            width={300}
+                            readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                            updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                        />
 
                         <Link href="login">Logg inn</Link>
                         <Link href="infopages/nystudent">Ny student</Link>
@@ -30,6 +36,7 @@ export default async function LoggedOutLandingPage() {
                     </div>
                 </div>
                 <Section
+                    position="left"
                     specialCmsImage="FRONTPAGE_1"
                     specialCmsParagraph="FRONTPAGE_1"
                     lesMer="/articles"
@@ -39,7 +46,7 @@ export default async function LoggedOutLandingPage() {
 
                 <InfoBubbles />
                 <Section
-                    right
+                    position="right"
                     specialCmsImage="FRONTPAGE_2"
                     specialCmsParagraph="FRONTPAGE_2"
                     lesMer="/articles"
@@ -52,13 +59,14 @@ export default async function LoggedOutLandingPage() {
                 <YouTube src="https://www.youtube.com/watch?v=I-zNLW4ILu4" />
                 <div className={styles.emptyPart} />
                 <Section
+                    position="left"
                     specialCmsImage="FRONTPAGE_3"
                     specialCmsParagraph="FRONTPAGE_3"
                     lesMer="/career"
                     imgWidth={550}
                 />
                 <Section
-                    right
+                    position="right"
                     specialCmsImage="FRONTPAGE_4"
                     specialCmsParagraph="FRONTPAGE_4"
                     lesMer="infopages/loccom"
diff --git a/src/app/(home)/Section.module.scss b/src/app/(frontpage)/Section.module.scss
similarity index 100%
rename from src/app/(home)/Section.module.scss
rename to src/app/(frontpage)/Section.module.scss
diff --git a/src/app/(frontpage)/Section.tsx b/src/app/(frontpage)/Section.tsx
new file mode 100644
index 000000000..2dc79fe4f
--- /dev/null
+++ b/src/app/(frontpage)/Section.tsx
@@ -0,0 +1,54 @@
+import styles from './Section.module.scss'
+import SpecialCmsParagraph from '@/components/Cms/CmsParagraph/SpecialCmsParagraph'
+import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
+import {
+    readSpecialCmsImageFrontpage,
+    readSpecialCmsParagraphFrontpageSection,
+    updateSpecialCmsImageFrontpage,
+    updateSpecialCmsParagraphFrontpageSection
+} from '@/services/frontpage/actions'
+import React from 'react'
+import Link from 'next/link'
+import type {
+    SpecialCmsImage as SpecialCmsImageT,
+    SpecialCmsParagraph as SpecialCmsParagraphT
+} from '@prisma/client'
+
+type PropTypes = {
+    specialCmsImage: SpecialCmsImageT,
+    specialCmsParagraph: SpecialCmsParagraphT,
+    lesMer: string,
+    position: 'left' | 'right',
+    imgWidth: number,
+    id?: string,
+}
+
+function Section({ specialCmsImage, specialCmsParagraph, lesMer, position, imgWidth, id }: PropTypes) {
+    const imgContainer = (
+        <div style={{ width: imgWidth }} className={styles.imgContainer}>
+            <SpecialCmsImage
+                special={specialCmsImage}
+                width={imgWidth}
+                readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                updateCmsImageAction={updateSpecialCmsImageFrontpage}
+            />
+        </div>
+    )
+    return (
+        <div id={id} className={`${styles.section} ${position === 'right' && styles.blue}`}>
+            {position === 'left' && imgContainer}
+            <div>
+                <SpecialCmsParagraph
+                    className={styles.paragraph}
+                    special={specialCmsParagraph}
+                    readSpecialCmsParagraphAction={readSpecialCmsParagraphFrontpageSection}
+                    updateCmsParagraphAction={updateSpecialCmsParagraphFrontpageSection}
+                />
+                <Link className={styles.readMore} href={lesMer}>Les mer</Link>
+            </div>
+            {position === 'right' && imgContainer}
+        </div>
+    )
+}
+
+export default Section
diff --git a/src/app/(home)/backgroundimages/Omegamai.jpeg b/src/app/(frontpage)/backgroundimages/Omegamai.jpeg
similarity index 100%
rename from src/app/(home)/backgroundimages/Omegamai.jpeg
rename to src/app/(frontpage)/backgroundimages/Omegamai.jpeg
diff --git a/src/app/(home)/backgroundimages/frontImg.jpeg b/src/app/(frontpage)/backgroundimages/frontImg.jpeg
similarity index 100%
rename from src/app/(home)/backgroundimages/frontImg.jpeg
rename to src/app/(frontpage)/backgroundimages/frontImg.jpeg
diff --git a/src/app/(home)/backgroundimages/taktlause.jpeg b/src/app/(frontpage)/backgroundimages/taktlause.jpeg
similarity index 100%
rename from src/app/(home)/backgroundimages/taktlause.jpeg
rename to src/app/(frontpage)/backgroundimages/taktlause.jpeg
diff --git a/src/app/(home)/page.module.scss b/src/app/(frontpage)/page.module.scss
similarity index 100%
rename from src/app/(home)/page.module.scss
rename to src/app/(frontpage)/page.module.scss
diff --git a/src/app/(home)/page.tsx b/src/app/(frontpage)/page.tsx
similarity index 100%
rename from src/app/(home)/page.tsx
rename to src/app/(frontpage)/page.tsx
diff --git a/src/app/(home)/Section.tsx b/src/app/(home)/Section.tsx
deleted file mode 100644
index 15bea3932..000000000
--- a/src/app/(home)/Section.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import styles from './Section.module.scss'
-import SpecialCmsParagraph from '@/components/Cms/CmsParagraph/SpecialCmsParagraph'
-import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
-import React from 'react'
-import Link from 'next/link'
-import type {
-    SpecialCmsImage as SpecialCmsImageT,
-    SpecialCmsParagraph as SpecialCmsParagraphT
-} from '@prisma/client'
-
-type PropTypes = {
-    specialCmsImage: SpecialCmsImageT,
-    specialCmsParagraph: SpecialCmsParagraphT,
-    lesMer: string,
-    right?: boolean,
-    imgWidth: number,
-    id?: string,
-}
-
-function Section({ specialCmsImage, specialCmsParagraph, lesMer, right, imgWidth, id }: PropTypes) {
-    const imgContainer = (
-        <div style={{ width: imgWidth }} className={styles.imgContainer}>
-            <SpecialCmsImage special={specialCmsImage} width={imgWidth} />
-        </div>
-    )
-    return (
-        <div id={id} className={`${styles.section} ${right && styles.blue}`}>
-            {!right && imgContainer}
-            <div>
-                <SpecialCmsParagraph className={styles.paragraph} special={specialCmsParagraph} />
-                <Link className={styles.readMore} href={lesMer}>Les mer</Link>
-            </div>
-            {right && imgContainer}
-        </div>
-    )
-}
-
-export default Section
diff --git a/src/app/_components/Cms/Article/AddSection.tsx b/src/app/_components/Cms/Article/AddSection.tsx
index cc2132575..10bd011b4 100644
--- a/src/app/_components/Cms/Article/AddSection.tsx
+++ b/src/app/_components/Cms/Article/AddSection.tsx
@@ -2,28 +2,36 @@
 
 import styles from './AddSection.module.scss'
 import AddParts from '@/cms/AddParts'
-import { addSectionToArticleAction } from '@/cms/articles/actions'
-import { maxSections } from '@/cms/articles/ConfigVars'
+import { maxSections } from '@/cms/articles/constants'
 import useEditing from '@/hooks/useEditing'
 import { useRouter } from 'next/navigation'
 import type { ArticleSectionPart } from '@/cms/articleSections/types'
+import type { AddSectionToArticleAction } from '@/cms/articles/types'
+import type { ConfiguredAction } from '@/services/actionTypes'
 
 type PropTypes = {
-    articleId: number,
     currentNumberSections: number,
+    addSectionToArticleAction: ConfiguredAction<AddSectionToArticleAction>
 }
 
-export default function AddSection({ articleId, currentNumberSections }: PropTypes) {
+export default function AddSection({
+    currentNumberSections,
+    addSectionToArticleAction
+}: PropTypes) {
     const { refresh } = useRouter()
     const canEdit = useEditing({}) //TODO: check visibility of article for user and pass it to useEditing
-    if (!canEdit) return null
 
-    const handleAdd = async (part: ArticleSectionPart) => {
-        addSectionToArticleAction(articleId, {
-            [part]: true,
+    const handleAdd = async (includePart: ArticleSectionPart) => {
+        await addSectionToArticleAction({
+            data: {
+                includeParts: {
+                    [includePart]: true,
+                }
+            }
         })
         refresh()
     }
+    if (!canEdit) return null
     return (
         <span className={styles.AddSection}>
             {
diff --git a/src/app/_components/Cms/Article/Article.tsx b/src/app/_components/Cms/Article/Article.tsx
index 78a0744c0..7af97a7c9 100644
--- a/src/app/_components/Cms/Article/Article.tsx
+++ b/src/app/_components/Cms/Article/Article.tsx
@@ -4,9 +4,18 @@ import SectionMover from './SectionMover'
 import ChangeName from './ChangeName'
 import CmsImage from '@/cms/CmsImage/CmsImage'
 import SlideInOnView from '@/components/SlideInOnView/SlideInOnView'
-import ArticleSection from '@/cms/ArticleSection/ArticleSection'
+import { configureAction } from '@/services/configureAction'
+import ArticleSection, {
+    type ArticleSectionActions
+} from '@/cms/ArticleSection/ArticleSection'
 import type { ReactNode } from 'react'
-import type { ExpandedArticle } from '@/cms/articles/types'
+import type {
+    AddSectionToArticleAction,
+    ExpandedArticle,
+    ReorderArticleSectionsAction,
+    UpdateArticleAction
+} from '@/cms/articles/types'
+import type { UpdateCmsImageAction } from '@/cms/images/types'
 
 export type PropTypes = {
     article: ExpandedArticle,
@@ -15,6 +24,13 @@ export type PropTypes = {
     noMargin?: boolean
     sideBarContent?: ReactNode
     sideBarClassName?: string
+    actions: {
+        updateCoverImageAction: UpdateCmsImageAction,
+        updateArticleAction: UpdateArticleAction,
+        addSectionToArticleAction: AddSectionToArticleAction,
+        reorderArticleSectionsAction: ReorderArticleSectionsAction,
+        articleSections: ArticleSectionActions
+    }
 }
 
 export default function Article({
@@ -24,14 +40,27 @@ export default function Article({
     noMargin = false,
     sideBarContent,
     sideBarClassName,
+    actions,
 }: PropTypes) {
     return (
         <span className={styles.Article}>
             {hideCoverImage ? <></> : (
                 <span className={`${coverImageClass} ${styles.coverImage}`}>
-                    <CmsImage width={500} cmsImage={article.coverImage} />
+                    <CmsImage
+                        width={500}
+                        cmsImage={article.coverImage}
+                        updateCmsImageAction={actions.updateCoverImageAction}
+                    />
                     <SlideInOnView direction="bottom">
-                        <ChangeName article={article} />
+                        <ChangeName
+                            article={article}
+                            updateArticleAction={
+                                configureAction(
+                                    actions.updateArticleAction,
+                                    { params: { articleId: article.id } }
+                                )
+                            }
+                        />
                     </SlideInOnView>
                 </span>
             )}
@@ -41,13 +70,22 @@ export default function Article({
                         article.articleSections.sort((a, b) => (a.order - b.order)).map((section, i) => (
                             <SlideInOnView direction="left" key={section.id}>
                                 <span className={styles.moveSection}>
-                                    <ArticleSection articleSection={section} />
+                                    <ArticleSection actions={actions.articleSections} articleSection={section} />
                                     <SectionMover
                                         showUp={i !== 0}
                                         showDown={i !== article.articleSections.length - 1}
-                                        articleId={article.id}
-                                        sectionId={section.id}
                                         className={styles.moverComponent}
+                                        reorderArticleSectionsAction={
+                                            configureAction(
+                                                actions.reorderArticleSectionsAction,
+                                                {
+                                                    params: {
+                                                        articleId: article.id,
+                                                        sectionId: section.id
+                                                    }
+                                                }
+                                            )
+                                        }
                                     />
                                 </span>
                             </SlideInOnView>
@@ -63,7 +101,15 @@ export default function Article({
                 </aside>
             )}
             <div className={styles.addSection}>
-                <AddSection articleId={article.id} currentNumberSections={article.articleSections.length} />
+                <AddSection
+                    currentNumberSections={article.articleSections.length}
+                    addSectionToArticleAction={
+                        configureAction(
+                            actions.addSectionToArticleAction,
+                            { params: { articleId: article.id } }
+                        )
+                    }
+                />
             </div>
         </span>
     )
diff --git a/src/app/_components/Cms/Article/ChangeName.tsx b/src/app/_components/Cms/Article/ChangeName.tsx
index 9056f196a..01079ebb6 100644
--- a/src/app/_components/Cms/Article/ChangeName.tsx
+++ b/src/app/_components/Cms/Article/ChangeName.tsx
@@ -1,17 +1,17 @@
 'use client'
 import styles from './ChangeName.module.scss'
 import EditableTextField from '@/components/EditableTextField/EditableTextField'
-import { updateArticleAction } from '@/services/cms/articles/actions'
 import React, { useState } from 'react'
 import { usePathname } from 'next/navigation'
-import type { ExpandedArticle } from '@/cms/articles/types'
+import type { ExpandedArticle, UpdateArticleAction } from '@/cms/articles/types'
+import type { ConfiguredAction } from '@/services/actionTypes'
 
 type PropTypes = {
     article: ExpandedArticle
+    updateArticleAction: ConfiguredAction<UpdateArticleAction>
 }
 
-export default function ChangeName({ article }: PropTypes) {
-    const changeName = updateArticleAction.bind(null, article.id)
+export default function ChangeName({ article, updateArticleAction }: PropTypes) {
     const currentPath = usePathname()
     const [currentName, setCurrentName] = useState(article.name)
     const successCallback = (data: ExpandedArticle | undefined) => {
@@ -27,7 +27,7 @@ export default function ChangeName({ article }: PropTypes) {
         <EditableTextField
             formProps={
                 {
-                    action: changeName,
+                    action: updateArticleAction,
                     successCallback
                 }
             }
diff --git a/src/app/_components/Cms/Article/SectionMover.tsx b/src/app/_components/Cms/Article/SectionMover.tsx
index 2424301d9..639a5f3ab 100644
--- a/src/app/_components/Cms/Article/SectionMover.tsx
+++ b/src/app/_components/Cms/Article/SectionMover.tsx
@@ -1,27 +1,32 @@
 'use client'
 import styles from './SectionMover.module.scss'
 import useEditing from '@/hooks/useEditing'
-import { moveSectionOrderAction } from '@/services/cms/articles/actions'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faArrowDown, faArrowUp } from '@fortawesome/free-solid-svg-icons'
 import { useCallback } from 'react'
 import { useRouter } from 'next/navigation'
+import type { ConfiguredAction } from '@/services/actionTypes'
+import type { ReorderArticleSectionsAction } from '@/cms/articles/types'
 
 type PropTypes = {
-    articleId: number
-    sectionId: number
     className?: string
     showUp: boolean
     showDown: boolean
+    reorderArticleSectionsAction: ConfiguredAction<ReorderArticleSectionsAction>
 }
 
-export default function SectionMover({ articleId, sectionId, className, showUp, showDown }: PropTypes) {
+export default function SectionMover({
+    className,
+    showUp,
+    showDown,
+    reorderArticleSectionsAction
+}: PropTypes) {
     const canEdit = useEditing({}) //TODO: check visibility of section for user and pass it to useEditing
     const { refresh } = useRouter()
     const handleMove = useCallback(async (direction: 'UP' | 'DOWN') => {
-        await moveSectionOrderAction(articleId, sectionId, direction)
+        await reorderArticleSectionsAction({ data: { direction } })
         refresh()
-    }, [sectionId, articleId, refresh])
+    }, [reorderArticleSectionsAction, refresh])
     if (!canEdit) return null
 
     return (
diff --git a/src/app/_components/Cms/ArticleSection/AddPartToArticleSection.tsx b/src/app/_components/Cms/ArticleSection/AddPartToArticleSection.tsx
index d4453fc28..26529b267 100644
--- a/src/app/_components/Cms/ArticleSection/AddPartToArticleSection.tsx
+++ b/src/app/_components/Cms/ArticleSection/AddPartToArticleSection.tsx
@@ -1,26 +1,34 @@
 'use client'
 import styles from './AddPartToArticleSection.module.scss'
-import { addArticleSectionPartAction } from '@/cms/articleSections/actions'
 import AddParts from '@/cms/AddParts'
 import useEditing from '@/hooks/useEditing'
 import { useCallback } from 'react'
 import { useRouter } from 'next/navigation'
 import type { PropTypes as AddPartsPropTypes } from '@/cms/AddParts'
-import type { ArticleSectionPart } from '@/cms/articleSections/types'
+import type {
+    AddPartToArticleSectionAction,
+    ArticleSectionPart,
+} from '@/cms/articleSections/types'
 import type { ReactNode } from 'react'
+import type { ConfiguredAction } from '@/services/actionTypes'
 
 type PropTypes = Omit<AddPartsPropTypes, 'onClick'> & {
-    articleSectionName: string
     children: ReactNode
+    addPartToArticleSectionAction: ConfiguredAction<AddPartToArticleSectionAction>
 }
 
-export default function AddPartToArticleSection({ articleSectionName, children, ...props }: PropTypes) {
+export default function AddPartToArticleSection({
+    children,
+    addPartToArticleSectionAction,
+    ...props
+}: PropTypes) {
     const { refresh } = useRouter()
     const canEdit = useEditing({}) //TODO: check visibility of article for user and pass it to useEditing
+
     const handleAdd = useCallback(async (part: ArticleSectionPart) => {
-        await addArticleSectionPartAction(articleSectionName, part)
+        await addPartToArticleSectionAction({ data: { part } })
         refresh()
-    }, [articleSectionName])
+    }, [addPartToArticleSectionAction, refresh])
     if (!canEdit) return children
 
     return (
diff --git a/src/app/_components/Cms/ArticleSection/ArticleSection.tsx b/src/app/_components/Cms/ArticleSection/ArticleSection.tsx
index 806204ec4..48c59900b 100644
--- a/src/app/_components/Cms/ArticleSection/ArticleSection.tsx
+++ b/src/app/_components/Cms/ArticleSection/ArticleSection.tsx
@@ -5,33 +5,62 @@ import AddPartToArticleSection from './AddPartToArticleSection'
 import CmsLink from '@/cms/CmsLink/CmsLink'
 import CmsImage from '@/cms/CmsImage/CmsImage'
 import CmsParagraph from '@/cms/CmsParagraph/CmsParagraph'
-import type { ExpandedCmsImage } from '@/cms/images/types'
+import { configureAction } from '@/services/configureAction'
 import type {
-    ArticleSection as ArticleSectionT,
-    CmsParagraph as CmsParagraphT,
-    CmsLink as CmsLinkT
-} from '@prisma/client'
+    ExpandedArticleSection,
+    AddPartToArticleSectionAction,
+    RemovePartFromArticleSectionAction,
+    UpdateArticleSectionAction
+} from '@/cms/articleSections/types'
+import type { UpdateCmsParagraphAction } from '@/cms/paragraphs/types'
+import type { UpdateCmsImageAction } from '@/cms/images/types'
+import type { UpdateCmsLinkAction } from '@/cms/links/types'
 
 type PropTypes = {
-    articleSection: ArticleSectionT & {
-        cmsParagraph: CmsParagraphT | null,
-        cmsImage: ExpandedCmsImage | null,
-        cmsLink: CmsLinkT | null
+    articleSection: ExpandedArticleSection
+    actions: {
+        updateCmsParagraph: UpdateCmsParagraphAction,
+        updateCmsImage: UpdateCmsImageAction,
+        updateCmsLink: UpdateCmsLinkAction,
+        updateArticleSection: UpdateArticleSectionAction,
+        addPartToArticleSection: AddPartToArticleSectionAction,
+        removePartFromArticleSection: RemovePartFromArticleSectionAction
     }
 }
 
-export default function ArticleSection({ articleSection }: PropTypes) {
+export type ArticleSectionActions = PropTypes['actions']
+
+export default function ArticleSection({
+    articleSection,
+    actions
+}: PropTypes) {
     const { cmsParagraph, cmsImage, cmsLink } = articleSection
 
     const cmsImageContent = (
         <span className={styles.image}>
             {cmsImage && <>
                 <span className={styles.cmsImageWithControls}>
-                    <CmsImage width={articleSection.imageSize} cmsImage={cmsImage} />
-                    <ImageControls className={styles.moveControls} articleSection={articleSection} />
+                    <CmsImage
+                        width={articleSection.imageSize}
+                        cmsImage={cmsImage}
+                        updateCmsImageAction={actions.updateCmsImage}
+                    />
+                    <ImageControls
+                        className={styles.moveControls}
+                        articleSection={articleSection}
+                        updateArticleSectionAction={actions.updateArticleSection}
+                    />
                 </span>
                 <div className={styles.remover}>
-                    <RemovePart articleSectionName={articleSection.name} part="cmsImage" />
+                    <RemovePart
+                        part="cmsImage"
+                        removePartFromArticleSectionAction={
+                            configureAction(
+                                actions.removePartFromArticleSection,
+                                { params: { articleSectionName: articleSection.name } }
+                            )
+                        }
+                    />
                 </div>
             </>
             }
@@ -41,10 +70,13 @@ export default function ArticleSection({ articleSection }: PropTypes) {
     return (
         <section className={styles.ArticleSection}>
             <AddPartToArticleSection
-                articleSectionName={articleSection.name}
                 showParagraphAdd={!cmsParagraph}
                 showImageAdd={!cmsImage}
                 showLinkAdd={!cmsLink}
+                addPartToArticleSectionAction={configureAction(
+                    actions.addPartToArticleSection,
+                    { params: { articleSectionName: articleSection.name } }
+                )}
             >
                 <span className={styles.content}>
                     {
@@ -56,18 +88,38 @@ export default function ArticleSection({ articleSection }: PropTypes) {
                             cmsParagraph &&
                         <span className={styles.paragraph}>
                             <div className={styles.remover}>
-                                <RemovePart articleSectionName={articleSection.name} part="cmsParagraph" />
+                                <RemovePart
+                                    part="cmsParagraph"
+                                    removePartFromArticleSectionAction={
+                                        configureAction(
+                                            actions.removePartFromArticleSection,
+                                            { params: { articleSectionName: articleSection.name } }
+                                        )
+                                    }
+                                />
                             </div>
-                            <CmsParagraph cmsParagraph={cmsParagraph} className={styles.paragrphComponent} />
+                            <CmsParagraph
+                                cmsParagraph={cmsParagraph}
+                                className={styles.paragrphComponent}
+                                updateCmsParagraphAction={actions.updateCmsParagraph}
+                            />
                         </span>
                         }
                         {
                             cmsLink &&
                         <div className={styles.link}>
                             <div className={styles.remover}>
-                                <RemovePart articleSectionName={articleSection.name} part="cmsLink" />
+                                <RemovePart
+                                    part="cmsLink"
+                                    removePartFromArticleSectionAction={
+                                        configureAction(
+                                            actions.removePartFromArticleSection,
+                                            { params: { articleSectionName: articleSection.name } }
+                                        )
+                                    }
+                                />
                             </div>
-                            <CmsLink cmsLink={cmsLink} />
+                            <CmsLink cmsLink={cmsLink} updateCmsLinkAction={actions.updateCmsLink} />
                         </div>
                         }
                     </div>
diff --git a/src/app/_components/Cms/ArticleSection/ImageControls.tsx b/src/app/_components/Cms/ArticleSection/ImageControls.tsx
index 21805c64f..46543095a 100644
--- a/src/app/_components/Cms/ArticleSection/ImageControls.tsx
+++ b/src/app/_components/Cms/ArticleSection/ImageControls.tsx
@@ -1,7 +1,6 @@
 'use client'
 import styles from './ImageControls.module.scss'
-import { updateArticleSectionAction } from '@/cms/articleSections/actions'
-import { imageSizeIncrement, maxImageSize, minImageSize } from '@/cms/articleSections/ConfigVars'
+import { imageSizeIncrement, maxImageSize, minImageSize } from '@/cms/articleSections/constants'
 import useEditing from '@/hooks/useEditing'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import {
@@ -12,39 +11,52 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 import { useRouter } from 'next/navigation'
 import type { ArticleSection } from '@prisma/client'
-
-/**
- * This component is used to control the image in the article section
- * i.e move it left or right and size it
- */
+import type { UpdateArticleSectionAction } from '@/cms/articleSections/types'
 
 type PropTypes = {
     articleSection: ArticleSection
     className?: string
+    updateArticleSectionAction: UpdateArticleSectionAction
 }
 
-export default function ImageControls({ articleSection, className }: PropTypes) {
+/**
+ * This component is used to control the image in the article section
+ * i.e move it left or right and size it
+ */
+export default function ImageControls({ articleSection, className, updateArticleSectionAction }: PropTypes) {
     const canEdit = useEditing({}) //TODO: check visibility of article for user and pass it to useEditing
     const { refresh } = useRouter()
     if (!canEdit) return null
 
     const moveLeft = async () => {
-        await updateArticleSectionAction(articleSection.name, { imagePosition: 'LEFT' })
+        await updateArticleSectionAction(
+            { params: { articleSectionName: articleSection.name } },
+            { data: { position: 'LEFT' } }
+        )
         refresh()
     }
 
     const moveRight = async () => {
-        await updateArticleSectionAction(articleSection.name, { imagePosition: 'RIGHT' })
+        await updateArticleSectionAction(
+            { params: { articleSectionName: articleSection.name } },
+            { data: { position: 'RIGHT' } }
+        )
         refresh()
     }
 
     const increaseSize = async () => {
-        await updateArticleSectionAction(articleSection.name, { imageSize: articleSection.imageSize + imageSizeIncrement })
+        await updateArticleSectionAction(
+            { params: { articleSectionName: articleSection.name } },
+            { data: { imageSize: articleSection.imageSize + imageSizeIncrement } }
+        )
         refresh()
     }
 
     const decreaseSize = async () => {
-        await updateArticleSectionAction(articleSection.name, { imageSize: articleSection.imageSize - imageSizeIncrement })
+        await updateArticleSectionAction(
+            { params: { articleSectionName: articleSection.name } },
+            { data: { imageSize: articleSection.imageSize - imageSizeIncrement } }
+        )
         refresh()
     }
 
diff --git a/src/app/_components/Cms/ArticleSection/RemovePart.tsx b/src/app/_components/Cms/ArticleSection/RemovePart.tsx
index e13e7625e..d2198be3c 100644
--- a/src/app/_components/Cms/ArticleSection/RemovePart.tsx
+++ b/src/app/_components/Cms/ArticleSection/RemovePart.tsx
@@ -1,6 +1,5 @@
 'use client'
 import styles from './RemovePart.module.scss'
-import { removeArticleSectionPartAction } from '@/cms/articleSections/actions'
 import Form from '@/components/Form/Form'
 import useClickOutsideRef from '@/hooks/useClickOutsideRef'
 import useEditing from '@/hooks/useEditing'
@@ -8,20 +7,21 @@ import { useRouter } from 'next/navigation'
 import { useState } from 'react'
 import { faX } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import type { ArticleSectionPart } from '@/cms/articleSections/types'
+import type { ArticleSectionPart, RemovePartFromArticleSectionAction } from '@/cms/articleSections/types'
+import type { ConfiguredAction } from '@/services/actionTypes'
 
 type PropTypes = {
     part: ArticleSectionPart,
-    articleSectionName: string
+    removePartFromArticleSectionAction: ConfiguredAction<RemovePartFromArticleSectionAction>
 }
 
-export default function RemovePart({ part, articleSectionName }: PropTypes) {
+export default function RemovePart({ part, removePartFromArticleSectionAction }: PropTypes) {
     const { refresh } = useRouter()
     const canEdit = useEditing({})
     const [confirmOpen, setConfirmOpen] = useState(false)
     const confirmRef = useClickOutsideRef(() => setConfirmOpen(false))
     if (!canEdit) return null
-    const handleRemove = removeArticleSectionPartAction.bind(null, articleSectionName).bind(null, part)
+    const handleRemove = removePartFromArticleSectionAction.bind(null, { data: { part } })
 
     return (
         <div ref={confirmRef} className={styles.RemovePart}>
diff --git a/src/app/_components/Cms/CmsImage/ChangeImage.tsx b/src/app/_components/Cms/CmsImage/ChangeImage.tsx
index b154db70d..ccc7ae8fd 100644
--- a/src/app/_components/Cms/CmsImage/ChangeImage.tsx
+++ b/src/app/_components/Cms/CmsImage/ChangeImage.tsx
@@ -4,19 +4,21 @@ import ChangeImageForm from './ChangeImageForm'
 import Image from '@/components/Image/Image'
 import { ImageSelectionContext } from '@/contexts/ImageSelection'
 import Form from '@/components/Form/Form'
-import { updateCmsImageConfigAction } from '@/services/cms/images/actions'
+import { configureAction } from '@/services/configureAction'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faTurnUp } from '@fortawesome/free-solid-svg-icons'
 import React, { useContext, useEffect, useState } from 'react'
 import type { ImageSize, Image as ImageT } from '@prisma/client'
+import type { UpdateCmsImageAction } from '@/cms/images/types'
 
 type PropTypes = {
     currentImage: ImageT,
     cmsImageId: number,
     currentImageSize: ImageSize,
+    updateCmsImageAction: UpdateCmsImageAction
 }
 
-export default function ChangeImage({ currentImage, cmsImageId, currentImageSize }: PropTypes) {
+export default function ChangeImage({ currentImage, cmsImageId, currentImageSize, updateCmsImageAction }: PropTypes) {
     const selectedContext = useContext(ImageSelectionContext)
     if (!selectedContext) throw new Error('ImageSelectionContext required to use ChangeImage')
 
@@ -62,15 +64,16 @@ export default function ChangeImage({ currentImage, cmsImageId, currentImageSize
             <i>image name: {currentImage.name}</i>
             {
                 selectedContext.selectedImage && selectedContext.selectedImage.id !== currentImage.id ? (
-                    <ChangeImageForm cmsImageId={cmsImageId} />
+                    <ChangeImageForm cmsImageId={cmsImageId} updateCmsImageAction={updateCmsImageAction} />
                 ) : (
                     <div className={styles.resolution}>
                         <p>Resolution: {currentImageSize.toLowerCase()}</p>
                         <Form
                             action={
-                                updateCmsImageConfigAction
-                                    .bind(null, cmsImageId)
-                                    .bind(null, { imageSize: changeToSize })
+                                configureAction(
+                                    updateCmsImageAction,
+                                    { params: { cmsImageId } }
+                                ).bind(null, { data: { imageSize: changeToSize } })
                             }
                             submitText={`change to ${changeToSize.toLocaleLowerCase()}`}
                             refreshOnSuccess
diff --git a/src/app/_components/Cms/CmsImage/ChangeImageForm.tsx b/src/app/_components/Cms/CmsImage/ChangeImageForm.tsx
index 86f300124..43b4cde89 100644
--- a/src/app/_components/Cms/CmsImage/ChangeImageForm.tsx
+++ b/src/app/_components/Cms/CmsImage/ChangeImageForm.tsx
@@ -1,15 +1,17 @@
 'use client'
-import { updateCmsImageAction } from '@/services/cms/images/actions'
 import Form from '@/components/Form/Form'
 import { ImageSelectionContext } from '@/contexts/ImageSelection'
+import { configureAction } from '@/services/configureAction'
 import { useContext } from 'react'
+import type { UpdateCmsImageAction } from '@/cms/images/types'
 
 type PropTypes = {
     cmsImageId: number
     className?: string
+    updateCmsImageAction: UpdateCmsImageAction
 }
 
-export default function ChangeImageForm({ cmsImageId, className }: PropTypes) {
+export default function ChangeImageForm({ cmsImageId, className, updateCmsImageAction }: PropTypes) {
     const selection = useContext(ImageSelectionContext)
 
     if (!selection?.selectedImage) throw new Error('ImageSelectionContext required to use ChangeImage')
@@ -18,7 +20,12 @@ export default function ChangeImageForm({ cmsImageId, className }: PropTypes) {
         <Form
             className={className}
             closePopUpOnSuccess={`EditCmsImage${cmsImageId}`}
-            action={updateCmsImageAction.bind(null, cmsImageId).bind(null, selection?.selectedImage?.id)}
+            action={
+                configureAction(
+                    updateCmsImageAction,
+                    { params: { cmsImageId } }
+                ).bind(null, { data: { imageId: selection?.selectedImage?.id } })
+            }
             submitText="change"
             refreshOnSuccess
         />
diff --git a/src/app/_components/Cms/CmsImage/CmsImage.tsx b/src/app/_components/Cms/CmsImage/CmsImage.tsx
index 514ddb69c..216b46700 100644
--- a/src/app/_components/Cms/CmsImage/CmsImage.tsx
+++ b/src/app/_components/Cms/CmsImage/CmsImage.tsx
@@ -3,13 +3,14 @@ import styles from './CmsImage.module.scss'
 import Image, { SrcImage } from '@/components/Image/Image'
 import { readSpecialImageAction } from '@/services/images/actions'
 import React from 'react'
-import type { ExpandedCmsImage } from '@/cms/images/types'
+import type { ExpandedCmsImage, UpdateCmsImageAction } from '@/cms/images/types'
 import type { PropTypes as ImagePropTypes } from '@/components/Image/Image'
 
 export type PropTypes = Omit<
     ImagePropTypes, 'className' | 'imageSize' | 'smallSize' | 'largeSize' | 'image' | 'children'
 > & {
     cmsImage: ExpandedCmsImage,
+    updateCmsImageAction: UpdateCmsImageAction,
     children?: React.ReactNode
     className?: string
     classNameImage?: string
@@ -29,6 +30,7 @@ export const fallbackImage = '/images/fallback.jpg'
  */
 export default async function CmsImage({
     cmsImage,
+    updateCmsImageAction,
     children,
     className = '',
     classNameImage,
@@ -44,7 +46,10 @@ export default async function CmsImage({
 
     return (
         <div className={`${styles.CmsImage} ${className}`}>
-            {!disableEditor && <CmsImageEditor cmsImage={{ ...cmsImage, image }}/> }
+            {!disableEditor && <CmsImageEditor
+                cmsImage={{ ...cmsImage, image }}
+                updateCmsImageAction={updateCmsImageAction}
+            />}
             <Image className={classNameImage} imageSize={cmsImage.imageSize} image={image} {...props}/>
             <div className={styles.children}>{children}</div>
         </div>
diff --git a/src/app/_components/Cms/CmsImage/CmsImageClient.tsx b/src/app/_components/Cms/CmsImage/CmsImageClient.tsx
index fa544f701..b17d3187a 100644
--- a/src/app/_components/Cms/CmsImage/CmsImageClient.tsx
+++ b/src/app/_components/Cms/CmsImage/CmsImageClient.tsx
@@ -19,6 +19,7 @@ import type { Image as ImageT } from '@prisma/client'
  */
 export default function CmsImageClient({
     cmsImage,
+    updateCmsImageAction,
     children,
     className = '',
     classNameImage,
@@ -38,7 +39,10 @@ export default function CmsImageClient({
 
     return (
         <div className={`${styles.CmsImage} ${className}`}>
-            {(image && !disableEditor) && <CmsImageEditor cmsImage={{ ...cmsImage, image }}/>}
+            {(image && !disableEditor) && <CmsImageEditor
+                updateCmsImageAction={updateCmsImageAction}
+                cmsImage={{ ...cmsImage, image }}
+            />}
             <div className={styles.children}>{children}</div>
             {image &&
                 <Image
diff --git a/src/app/_components/Cms/CmsImage/CmsImageEditor.tsx b/src/app/_components/Cms/CmsImage/CmsImageEditor.tsx
index 2637386d4..22191ddd4 100644
--- a/src/app/_components/Cms/CmsImage/CmsImageEditor.tsx
+++ b/src/app/_components/Cms/CmsImage/CmsImageEditor.tsx
@@ -15,11 +15,13 @@ import useEditing from '@/hooks/useEditing'
 import { useState } from 'react'
 import Link from 'next/link'
 import type { CmsImage, Image as ImageT } from '@prisma/client'
+import type { UpdateCmsImageAction } from '@/cms/images/types'
 
 type PropTypes = {
     cmsImage: CmsImage & {
         image: ImageT
-    }
+    },
+    updateCmsImageAction: UpdateCmsImageAction
 }
 
 /**
@@ -27,7 +29,7 @@ type PropTypes = {
  * @param cmsImage - the cms image to edit
  * @returns
  */
-export default function CmsImageEditor({ cmsImage }: PropTypes) {
+export default function CmsImageEditor({ cmsImage, updateCmsImageAction }: PropTypes) {
     const canEdit = useEditing({})
     const [currentCollectionId, setCurrentCollectionId] = useState<number>(cmsImage.image.collectionId)
 
@@ -66,9 +68,14 @@ export default function CmsImageEditor({ cmsImage }: PropTypes) {
                                     currentImageSize={cmsImage.imageSize}
                                     currentImage={cmsImage.image}
                                     cmsImageId={cmsImage.id}
+                                    updateCmsImageAction={updateCmsImageAction}
                                 />
                             </div>
-                            <ChangeImageForm className={styles.changeImageMobile} cmsImageId={cmsImage.id} />
+                            <ChangeImageForm
+                                className={styles.changeImageMobile}
+                                cmsImageId={cmsImage.id}
+                                updateCmsImageAction={updateCmsImageAction}
+                            />
                             <div className={styles.selectImage}>
                                 <ImageList/>
                             </div>
diff --git a/src/app/_components/Cms/CmsImage/SpecialCmsImage.tsx b/src/app/_components/Cms/CmsImage/SpecialCmsImage.tsx
index 0def3826d..b0f1394b3 100644
--- a/src/app/_components/Cms/CmsImage/SpecialCmsImage.tsx
+++ b/src/app/_components/Cms/CmsImage/SpecialCmsImage.tsx
@@ -1,10 +1,12 @@
 import CmsImage from './CmsImage'
-import { readSpecialCmsImageAction } from '@/services/cms/images/actions'
+import { configureAction } from '@/services/configureAction'
 import type { SpecialCmsImage as SpecialCmsImageT } from '@prisma/client'
 import type { PropTypes as CmsImageProps } from './CmsImage'
+import type { ReadSpecialCmsImageAction } from '@/cms/images/types'
 
 export type PropTypes = Omit<CmsImageProps, 'cmsImage'> & {
-    special: SpecialCmsImageT
+    special: SpecialCmsImageT,
+    readSpecialCmsImageAction: ReadSpecialCmsImageAction
 }
 /**
  * WARNING: This component is only meant for the server - use SpecialCmsImageClient for the client
@@ -12,8 +14,8 @@ export type PropTypes = Omit<CmsImageProps, 'cmsImage'> & {
  * @param special - the special cms image to display
  * @returns
  */
-export default async function SpecialCmsImage({ special, ...props }: PropTypes) {
-    const imageRes = await readSpecialCmsImageAction(special)
+export default async function SpecialCmsImage({ special, readSpecialCmsImageAction, ...props }: PropTypes) {
+    const imageRes = await configureAction(readSpecialCmsImageAction, { params: { special } })()
     if (!imageRes.success) throw new Error(`No special cms image found for ${special}`)
     const cmsImage = imageRes.data
 
diff --git a/src/app/_components/Cms/CmsImage/SpecialCmsImageClient.tsx b/src/app/_components/Cms/CmsImage/SpecialCmsImageClient.tsx
index f3ae1377d..443d1d515 100644
--- a/src/app/_components/Cms/CmsImage/SpecialCmsImageClient.tsx
+++ b/src/app/_components/Cms/CmsImage/SpecialCmsImageClient.tsx
@@ -1,7 +1,7 @@
 'use client'
 import CmsImageClient from './CmsImageClient'
-import { readSpecialCmsImageAction } from '@/services/cms/images/actions'
 import useActionCall from '@/hooks/useActionCall'
+import { configureAction } from '@/services/configureAction'
 import { useCallback } from 'react'
 import type { PropTypes } from './SpecialCmsImage'
 
@@ -11,14 +11,22 @@ import type { PropTypes } from './SpecialCmsImage'
  * @param special - the special cms image to display
  * @returns
  */
-export default function SpecialCmsImageClient({ special, ...props }: PropTypes) {
-    const action = useCallback(() => readSpecialCmsImageAction(special), [special])
+export default function SpecialCmsImageClient({
+    special,
+    updateCmsImageAction,
+    readSpecialCmsImageAction,
+    ...props
+}: PropTypes) {
+    const action = useCallback(configureAction(
+        readSpecialCmsImageAction,
+        { params: { special } }
+    ), [special])
     const { data: cmsImage, error } = useActionCall(action)
     if (error) throw new Error(`No special cms image found for ${special}`)
 
     return (
         cmsImage && (
-            <CmsImageClient {...props} cmsImage={cmsImage} />
+            <CmsImageClient {...props} cmsImage={cmsImage} updateCmsImageAction={updateCmsImageAction} />
         )
     )
 }
diff --git a/src/app/_components/Cms/CmsLink/CmsLink.tsx b/src/app/_components/Cms/CmsLink/CmsLink.tsx
index 9c0197c50..6c74e4d45 100644
--- a/src/app/_components/Cms/CmsLink/CmsLink.tsx
+++ b/src/app/_components/Cms/CmsLink/CmsLink.tsx
@@ -2,18 +2,20 @@ import styles from './CmsLink.module.scss'
 import CmsLinkEditor from './CmsLinkEditor'
 import Link from 'next/link'
 import type { CmsLink as CmsLinkT } from '@prisma/client'
+import type { UpdateCmsLinkAction } from '@/cms/links/types'
 
 type PropTypes = {
     cmsLink: CmsLinkT
     className?: string
     color?: 'primary' | 'secondary'
+    updateCmsLinkAction: UpdateCmsLinkAction
 }
 
-export default function CmsLink({ cmsLink, className, color = 'secondary' }: PropTypes) {
+export default function CmsLink({ cmsLink, className, color = 'secondary', updateCmsLinkAction }: PropTypes) {
     return (
         <div className={`${styles.CmsLink} ${className}`}>
             <Link href={cmsLink.url} className={`${styles.CmsLink} ${styles[color]}`}>{cmsLink.text}</Link>
-            <CmsLinkEditor cmsLink={cmsLink} />
+            <CmsLinkEditor cmsLink={cmsLink} updateCmsLinkAction={updateCmsLinkAction} />
         </div>
     )
 }
diff --git a/src/app/_components/Cms/CmsLink/CmsLinkEditor.tsx b/src/app/_components/Cms/CmsLink/CmsLinkEditor.tsx
index a683fea17..5a5abba9e 100644
--- a/src/app/_components/Cms/CmsLink/CmsLinkEditor.tsx
+++ b/src/app/_components/Cms/CmsLink/CmsLinkEditor.tsx
@@ -3,17 +3,19 @@ import styles from './CmsLinkEditor.module.scss'
 import TextInput from '@/components/UI/TextInput'
 import EditOverlay from '@/cms/EditOverlay'
 import Form from '@/components/Form/Form'
-import { updateCmsLinkAction } from '@/cms/links/actions'
 import PopUp from '@/components/PopUp/PopUp'
 import useEditing from '@/hooks/useEditing'
+import { configureAction } from '@/services/configureAction'
 import { useRouter } from 'next/navigation'
 import type { CmsLink } from '@prisma/client'
+import type { UpdateCmsLinkAction } from '@/cms/links/types'
 
 type PropTypes = {
     cmsLink: CmsLink
+    updateCmsLinkAction: UpdateCmsLinkAction
 }
 
-export default function CmsLinkEditor({ cmsLink }: PropTypes) {
+export default function CmsLinkEditor({ cmsLink, updateCmsLinkAction }: PropTypes) {
     const canEdit = useEditing({}) //TODO: check visibility of cmsLink for user and pass it to useEditing
     const { refresh } = useRouter()
     if (!canEdit) return null
@@ -27,7 +29,12 @@ export default function CmsLinkEditor({ cmsLink }: PropTypes) {
             }>
             <Form
                 className={styles.CmsLinkEditor}
-                action={updateCmsLinkAction.bind(null, cmsLink.id)}
+                action={
+                    configureAction(
+                        updateCmsLinkAction,
+                        { params: { linkId: cmsLink.id } }
+                    )
+                }
                 submitText="Endre Lenke"
                 successCallback={refresh}
             >
diff --git a/src/app/_components/Cms/CmsParagraph/CmsParagraph.tsx b/src/app/_components/Cms/CmsParagraph/CmsParagraph.tsx
index a83623405..b2ee4f161 100644
--- a/src/app/_components/Cms/CmsParagraph/CmsParagraph.tsx
+++ b/src/app/_components/Cms/CmsParagraph/CmsParagraph.tsx
@@ -2,13 +2,15 @@ import styles from './CmsParagraph.module.scss'
 import ParagraphEditor from './CmsParagraphEditor'
 import React from 'react'
 import type { CmsParagraph as CmsParagraphT } from '@prisma/client'
+import type { UpdateCmsParagraphAction } from '@/cms/paragraphs/types'
 
 export type PropTypes = {
     cmsParagraph: CmsParagraphT
     className?: string
+    updateCmsParagraphAction: UpdateCmsParagraphAction
 }
 
-export default function CmsParagraph({ cmsParagraph, className }: PropTypes) {
+export default function CmsParagraph({ cmsParagraph, className, updateCmsParagraphAction }: PropTypes) {
     return (
         <>
             <div className={`${styles.CmsParagraph} ${className}`}>
@@ -20,7 +22,7 @@ export default function CmsParagraph({ cmsParagraph, className }: PropTypes) {
                 ) : (
                     <i>Her var det ikke noe innhold</i>
                 )}
-                <ParagraphEditor cmsParagraph={cmsParagraph} />
+                <ParagraphEditor cmsParagraph={cmsParagraph} updateCmsParagraphAction={updateCmsParagraphAction} />
             </div>
         </>
     )
diff --git a/src/app/_components/Cms/CmsParagraph/CmsParagraphEditor.tsx b/src/app/_components/Cms/CmsParagraph/CmsParagraphEditor.tsx
index 373f1e248..ba7e42399 100644
--- a/src/app/_components/Cms/CmsParagraph/CmsParagraphEditor.tsx
+++ b/src/app/_components/Cms/CmsParagraph/CmsParagraphEditor.tsx
@@ -4,13 +4,14 @@ import EditOverlay from '@/components/Cms/EditOverlay'
 import Form from '@/components/Form/Form'
 import PopUp from '@/components/PopUp/PopUp'
 import useEditing from '@/hooks/useEditing'
-import { updateCmsParagraphAction } from '@/services/cms/paragraphs/actions'
+import { configureAction } from '@/services/configureAction'
 import { useState } from 'react'
 import { useRouter } from 'next/navigation'
 import 'easymde/dist/easymde.min.css'
 import './CustomEditorClasses.scss'
 import dynamic from 'next/dynamic'
 import type { CmsParagraph } from '@prisma/client'
+import type { UpdateCmsParagraphAction } from '@/cms/paragraphs/types'
 
 //needed because SimpleMDE is not SSR compatible as it access navigator object
 const DynamicSimpleMDEditor = dynamic(
@@ -24,9 +25,10 @@ const DynamicSimpleMDEditor = dynamic(
 type PropTypes = {
     cmsParagraph: CmsParagraph
     editorClassName?: string
+    updateCmsParagraphAction: UpdateCmsParagraphAction
 }
 
-export default function CmsParagraphEditor({ cmsParagraph, editorClassName }: PropTypes) {
+export default function CmsParagraphEditor({ cmsParagraph, editorClassName, updateCmsParagraphAction }: PropTypes) {
     const canEdit = useEditing({}) //TODO: pass visibility / permissions to useEditing
     const { refresh } = useRouter()
     const [content, setContent] = useState(cmsParagraph.contentMd)
@@ -37,6 +39,8 @@ export default function CmsParagraphEditor({ cmsParagraph, editorClassName }: Pr
         setContent(value)
     }
 
+    const action = configureAction(updateCmsParagraphAction, { params: { paragraphId: cmsParagraph.id } })
+
     return (
         <PopUp
             PopUpKey={cmsParagraph.id}
@@ -47,7 +51,7 @@ export default function CmsParagraphEditor({ cmsParagraph, editorClassName }: Pr
             <div className={`${styles.CmsParagraphEditor} ${editorClassName}`}>
                 <DynamicSimpleMDEditor className={styles.editor} value={content} onChange={handleContentChange} />
                 <Form
-                    action={updateCmsParagraphAction.bind(null, cmsParagraph.id).bind(null, content)}
+                    action={action.bind(null, { data: { markdown: content } })}
                     submitText="Oppdater"
                     successCallback={() => {
                         refresh()
diff --git a/src/app/_components/Cms/CmsParagraph/SpecialCmsParagraph.tsx b/src/app/_components/Cms/CmsParagraph/SpecialCmsParagraph.tsx
index 84bf5482b..589dfa39f 100644
--- a/src/app/_components/Cms/CmsParagraph/SpecialCmsParagraph.tsx
+++ b/src/app/_components/Cms/CmsParagraph/SpecialCmsParagraph.tsx
@@ -1,11 +1,13 @@
 import CmsParagraph from './CmsParagraph'
-import { readSpecialCmsParagraphAction } from '@/services/cms/paragraphs/actions'
+import { configureAction } from '@/services/configureAction'
 import React from 'react'
 import type { PropTypes as PropTypesCmsParapraph } from './CmsParagraph'
 import type { SpecialCmsParagraph as SpecialCmsParagraphT } from '@prisma/client'
+import type { ReadSpecialCmsParagraphAction } from '@/cms/paragraphs/types'
 
 type PropTypes = Omit<PropTypesCmsParapraph, 'cmsParagraph'> & {
-    special: SpecialCmsParagraphT
+    special: SpecialCmsParagraphT,
+    readSpecialCmsParagraphAction: ReadSpecialCmsParagraphAction
 }
 
 /**
@@ -16,10 +18,12 @@ type PropTypes = Omit<PropTypesCmsParapraph, 'cmsParagraph'> & {
  * A component that reads a special type of paragraph using readSpecialCmsParagraphAction
  * then renders it using standard CmsParagraph
  * @param special - the special type of the paragraph to read
+ * @param readSpecialCmsParagraphAction - the action to read the special paragraph - this should be the specific
+ * implementation of the readSpecial service.
  * @returns
  */
-export default async function SpecialCmsParagraph({ special, ...props }: PropTypes) {
-    const res = await readSpecialCmsParagraphAction(special)
+export default async function SpecialCmsParagraph({ special, readSpecialCmsParagraphAction, ...props }: PropTypes) {
+    const res = await configureAction(readSpecialCmsParagraphAction, { params: { special } })()
     if (!res.success) return <i>Error: {res.error && res.error[0].message}</i>
 
     return (
diff --git a/src/app/_components/Cms/PublicArticle/PublicArticle.tsx b/src/app/_components/Cms/PublicArticle/PublicArticle.tsx
new file mode 100644
index 000000000..a9ac75005
--- /dev/null
+++ b/src/app/_components/Cms/PublicArticle/PublicArticle.tsx
@@ -0,0 +1,66 @@
+import Article, { type PropTypes } from '@/cms/Article/Article'
+import { configureAction } from '@/services/configureAction'
+import {
+    updatePublicArticleAction,
+    updatePublicArticleAddSectionAction,
+    updatePublicArticleCmsImageAction,
+    updatePublicArticleCmsLinkAction,
+    updatePublicArticleCmsParagraphAction,
+    updatePublicArticleCoverImageAction,
+    updatePublicArticleReorderSectionsAction,
+    updatePublicArticleSectionAction,
+    updatePublicArticleSectionsAddPartAction,
+    updatePublicArticleSectionsRemovePartAction
+} from '@/services/publicArticles/actions'
+import React from 'react'
+
+function PublicArticle(props: Omit<PropTypes, 'actions'>) {
+    return (
+        <Article {...props} actions={{
+            updateArticleAction: configureAction(
+                updatePublicArticleAction,
+                { implementationParams: undefined }
+            ),
+            updateCoverImageAction: configureAction(
+                updatePublicArticleCoverImageAction,
+                { implementationParams: undefined }
+            ),
+            addSectionToArticleAction: configureAction(
+                updatePublicArticleAddSectionAction,
+                { implementationParams: undefined }
+            ),
+            reorderArticleSectionsAction: configureAction(
+                updatePublicArticleReorderSectionsAction,
+                { implementationParams: undefined }
+            ),
+            articleSections: {
+                updateCmsParagraph: configureAction(
+                    updatePublicArticleCmsParagraphAction,
+                    { implementationParams: undefined }
+                ),
+                updateCmsImage: configureAction(
+                    updatePublicArticleCmsImageAction,
+                    { implementationParams: undefined }
+                ),
+                updateCmsLink: configureAction(
+                    updatePublicArticleCmsLinkAction,
+                    { implementationParams: undefined }
+                ),
+                updateArticleSection: configureAction(
+                    updatePublicArticleSectionAction,
+                    { implementationParams: undefined }
+                ),
+                addPartToArticleSection: configureAction(
+                    updatePublicArticleSectionsAddPartAction,
+                    { implementationParams: undefined }
+                ),
+                removePartFromArticleSection: configureAction(
+                    updatePublicArticleSectionsRemovePartAction,
+                    { implementationParams: undefined }
+                )
+            }
+        }} />
+    )
+}
+
+export default PublicArticle
diff --git a/src/app/_components/CommitteeImage/CommitteeImage.tsx b/src/app/_components/CommitteeImage/CommitteeImage.tsx
index 11d14840b..53f82e946 100644
--- a/src/app/_components/CommitteeImage/CommitteeImage.tsx
+++ b/src/app/_components/CommitteeImage/CommitteeImage.tsx
@@ -1,6 +1,8 @@
 import styles from './CommitteeImage.module.scss'
 import CmsImage from '@/cms/CmsImage/CmsImage'
 import Image from '@/components/Image/Image'
+import { configureAction } from '@/services/configureAction'
+import { updateCommitteeArticleCoverImageAction } from '@/services/groups/committees/actions'
 import type { ReactNode } from 'react'
 import type { Image as ImageT } from '@prisma/client'
 import type { ExpandedCmsImage } from '@/cms/images/types'
@@ -9,7 +11,8 @@ type PropTypes = {
     children?: ReactNode
     logoImage: ImageT
     coverImage: ExpandedCmsImage
-    grayScale?: boolean
+    grayScale?: boolean,
+    shortName: string
 }
 /**
  * A component that renders a backdrop image with a content div on top of it
@@ -17,7 +20,13 @@ type PropTypes = {
  * @param image - The image to render as a backdrop
  * @param grayScale - Whether the image should be rendered in grayscale (true by default)
  * */
-export default function CommitteeImage({ children, logoImage, coverImage, grayScale = false }: PropTypes) {
+export default function CommitteeImage({
+    children,
+    logoImage,
+    coverImage,
+    shortName,
+    grayScale = false
+}: PropTypes) {
     return (
         <div className={styles.CommitteeImage}>
             <div className={styles.content}>
@@ -32,6 +41,10 @@ export default function CommitteeImage({ children, logoImage, coverImage, graySc
                     />
                 </div>
                 <CmsImage
+                    updateCmsImageAction={configureAction(
+                        updateCommitteeArticleCoverImageAction,
+                        { implementationParams: { shortName } }
+                    )}
                     className={styles.committeeImage}
                     cmsImage={coverImage}
                     width={600}
diff --git a/src/app/_components/Company/Company.tsx b/src/app/_components/Company/Company.tsx
index e4e04063a..9348c3a6a 100644
--- a/src/app/_components/Company/Company.tsx
+++ b/src/app/_components/Company/Company.tsx
@@ -6,7 +6,11 @@ import CmsImage from '@/cms/CmsImage/CmsImage'
 import CmsImageClient from '@/cms/CmsImage/CmsImageClient'
 import Form from '@/components/Form/Form'
 import { companyAuth } from '@/services/career/companies/auth'
-import { destroyCompanyAction, updateComanyAction } from '@/services/career/companies/actions'
+import {
+    destroyCompanyAction,
+    updateCompanyAction,
+    updateCompanyCmsLogoAction
+} from '@/services/career/companies/actions'
 import { configureAction } from '@/services/configureAction'
 import type { CompanyExpanded } from '@/services/career/companies/types'
 import type { SessionMaybeUser } from '@/auth/session/Session'
@@ -40,6 +44,10 @@ export default function Company({
 }: PropTypes) {
     const canUpdate = companyAuth.update.dynamicFields({}).auth(session)
     const canDestroy = companyAuth.destroy.dynamicFields({}).auth(session)
+    const updateCmsImageAction = configureAction(
+        updateCompanyCmsLogoAction,
+        { implementationParams: { companyId: company.id } }
+    )
     return (
         <div className={styles.Company}>
             {asClient ?
@@ -48,12 +56,15 @@ export default function Company({
                     className={squareLogo ? styles.logoSq : styles.logo}
                     cmsImage={company.logo}
                     width={logoWidth}
+                    updateCmsImageAction={updateCmsImageAction}
+
                 /> :
                 <CmsImage
                     disableEditor={disableEdit}
                     className={squareLogo ? styles.logoSq : styles.logo}
                     cmsImage={company.logo}
                     width={logoWidth}
+                    updateCmsImageAction={updateCmsImageAction}
                 />
             }
             <div className={styles.info}>
@@ -64,7 +75,7 @@ export default function Company({
                         <SettingsHeaderItemPopUp showButtonClass={styles.showSettings} PopUpKey={`Edit ${company.id}`}>
                             <Form
                                 title="Rediger Bedrift"
-                                action={configureAction(updateComanyAction, { params: { id: company.id } })}
+                                action={configureAction(updateCompanyAction, { params: { id: company.id } })}
                                 refreshOnSuccess
                                 closePopUpOnSuccess={`Edit ${company.id}`}
                                 submitText="Lagre"
diff --git a/src/app/_components/Event/EventCard.tsx b/src/app/_components/Event/EventCard.tsx
index 95a7be7ac..3b155b834 100644
--- a/src/app/_components/Event/EventCard.tsx
+++ b/src/app/_components/Event/EventCard.tsx
@@ -1,11 +1,11 @@
 import SmallEventTag from './SmallEventTag'
 import styles from './EventCard.module.scss'
 import ImageCard from '@/components/ImageCard/ImageCard'
+import { formatVevenUri } from '@/lib/urlEncoding'
 import React from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faCalendar, faLocationDot, faUsers } from '@fortawesome/free-solid-svg-icons'
 import type { EventExpanded } from '@/services/events/types'
-import { formatVevenUri } from '@/lib/urlEncoding'
 
 export default function EventCard({ event }: {
     event: EventExpanded,
diff --git a/src/app/_components/Footer/Footer.tsx b/src/app/_components/Footer/Footer.tsx
index 1b5512802..90cc85a72 100644
--- a/src/app/_components/Footer/Footer.tsx
+++ b/src/app/_components/Footer/Footer.tsx
@@ -1,13 +1,19 @@
 import styles from './Footer.module.scss'
 import SocialIcons from '@/components/SocialIcons/SocialIcons'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import Link from 'next/link'
 
 function Footer() {
     return (
         <footer className={styles.Footer}>
             <div>
-                <SpecialCmsImage special="FOOTER_LOGO" width={350} />
+                <SpecialCmsImage
+                    special="FOOTER_LOGO"
+                    width={350}
+                    readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                    updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                />
                 <p>
                 Linjeforeningen for Elektronisk Systemdesign
                 og Innovasjon (MTELSYS) og Kybernetikk og
@@ -15,7 +21,12 @@ function Footer() {
                 </p>
                 <p>Org. Nr. 890 384 692</p>
                 <div>
-                    <SpecialCmsImage special="FOOTER_1" width={200} >
+                    <SpecialCmsImage
+                        special="FOOTER_1"
+                        width={200}
+                        readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                        updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                    >
                         <Link className={styles.pwa} href="/infopages/pwa" />
                     </SpecialCmsImage>
                     <div className={styles.icons}>
@@ -39,10 +50,20 @@ function Footer() {
                 <p>7491 Trondheim</p>
             </div>
             <div className={styles.sponsors}>
-                <SpecialCmsImage special="FOOTER_2" width={170}>
+                <SpecialCmsImage
+                    special="FOOTER_2"
+                    width={170}
+                    readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                    updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                >
                     <Link href="http://www.nordicsemi.com" target="_blank" />
                 </SpecialCmsImage>
-                <SpecialCmsImage special="FOOTER_3" width={100}>
+                <SpecialCmsImage
+                    special="FOOTER_3"
+                    width={100}
+                    readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                    updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                >
                     <Link href="http://www.kongsberg.com" target="_blank" />
                 </SpecialCmsImage>
             </div>
diff --git a/src/app/_components/Form/Form.tsx b/src/app/_components/Form/Form.tsx
index aaac3a3d8..49ba08c99 100644
--- a/src/app/_components/Form/Form.tsx
+++ b/src/app/_components/Form/Form.tsx
@@ -9,7 +9,7 @@ import { useRouter } from 'next/navigation'
 import type { PopUpKeyType } from '@/contexts/PopUp'
 import type { Colors, Confirmation } from '@/components/UI/SubmitButton'
 import type { FormHTMLAttributes, ReactNode, DetailedHTMLProps } from 'react'
-import type { Action } from '@/services/actionTypes'
+import type { ActionFormData } from '@/services/actionTypes'
 import type { ErrorMessage } from '@/services/error'
 
 type FormType = DetailedHTMLProps<FormHTMLAttributes<HTMLFormElement>, HTMLFormElement>
@@ -19,7 +19,7 @@ export type PropTypes<ReturnType> = Omit<FormType, 'action' | 'children'> & {
     submitText?: string,
     submitColor?: Colors,
     confirmation?: Confirmation,
-    action: Action<ReturnType>,
+    action: ActionFormData<ReturnType>,
     successCallback?: (data?: ReturnType) => void,
     refreshOnSuccess?: boolean,
     navigateOnSuccess?: string | ((data?: ReturnType) => string | null),
diff --git a/src/app/_components/Loader/Loader.tsx b/src/app/_components/Loader/Loader.tsx
index 640dfcded..c1b49ffb6 100644
--- a/src/app/_components/Loader/Loader.tsx
+++ b/src/app/_components/Loader/Loader.tsx
@@ -1,10 +1,17 @@
 import styles from './Loader.module.scss'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
 
 function Loader() {
     return (
         <div className={styles.Loader}>
-            <SpecialCmsImage special="LOADER_IMAGE" width={100} />
+            <SpecialCmsImage
+                special="LOADER_IMAGE"
+                width={100}
+                //TODO: Probably call through other service see comments in frontpage operations
+                readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                updateCmsImageAction={updateSpecialCmsImageFrontpage}
+            />
         </div>
     )
 }
diff --git a/src/app/_components/NavBar/MobileNavBar.tsx b/src/app/_components/NavBar/MobileNavBar.tsx
index 183288f58..996fd33c8 100644
--- a/src/app/_components/NavBar/MobileNavBar.tsx
+++ b/src/app/_components/NavBar/MobileNavBar.tsx
@@ -4,6 +4,7 @@ import Menu from './Menu'
 import UserNavigation from './UserNavigation'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
 import EditModeSwitch from '@/components/EditModeSwitch/EditModeSwitch'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import Link from 'next/link'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faBars } from '@fortawesome/free-solid-svg-icons'
@@ -30,7 +31,12 @@ export default async function MobileNavBar({ profile }: PropTypes) {
                 ))
             }
             <div>
-                <SpecialCmsImage special="MOBILE_NAV_PRIMARY_BUTTON" width={30}>
+                <SpecialCmsImage
+                    special="MOBILE_NAV_PRIMARY_BUTTON"
+                    width={30}
+                    readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                    updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                >
                     <Link className={styles.imagelink} href="/"/>
                 </SpecialCmsImage>
             </div>
@@ -41,6 +47,8 @@ export default async function MobileNavBar({ profile }: PropTypes) {
                     height={25}
                     alt="log in button"
                     className={styles.image}
+                    readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                    updateCmsImageAction={updateSpecialCmsImageFrontpage}
                 />
                 <UserNavigation profile={profile} />
             </div>
diff --git a/src/app/_components/NavBar/NavBar.tsx b/src/app/_components/NavBar/NavBar.tsx
index d58c22838..a71f8b064 100644
--- a/src/app/_components/NavBar/NavBar.tsx
+++ b/src/app/_components/NavBar/NavBar.tsx
@@ -6,6 +6,7 @@ import UserNavigation from './UserNavigation'
 import ReportButton from './ReportButton'
 import EditModeSwitch from '@/components/EditModeSwitch/EditModeSwitch'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import Link from 'next/link'
 import type { Profile } from '@/services/users/types'
 
@@ -34,6 +35,8 @@ export default async function NavBar({ profile }: PropTypes) {
                         special="NAV_PRIMARY_BUTTON"
                         width={30}
                         alt="omega logo"
+                        readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                        updateCmsImageAction={updateSpecialCmsImageFrontpage}
                     >
                         <Link href="/" />
                     </SpecialCmsImage>
@@ -58,6 +61,8 @@ export default async function NavBar({ profile }: PropTypes) {
                             width={25}
                             height={25}
                             alt="log in button"
+                            readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                            updateCmsImageAction={updateSpecialCmsImageFrontpage}
                         />
                         <UserNavigation profile={profile} />
                     </div>
diff --git a/src/app/_components/School/School.tsx b/src/app/_components/School/School.tsx
index b55a62957..50af71b9a 100644
--- a/src/app/_components/School/School.tsx
+++ b/src/app/_components/School/School.tsx
@@ -3,6 +3,12 @@ import CmsImageClient from '@/cms/CmsImage/CmsImageClient'
 import CmsLink from '@/cms/CmsLink/CmsLink'
 import CmsImage from '@/cms/CmsImage/CmsImage'
 import CmsParagraph from '@/cms/CmsParagraph/CmsParagraph'
+import {
+    updateSchoolCmsImageAction,
+    updateSchoolCmsLinkAction,
+    updateSchoolCmsParagraphContentAction
+} from '@/services/education/schools/actions'
+import { configureAction } from '@/services/configureAction'
 import type { ExpandedSchool } from '@/services/education/schools/types'
 
 type PropTypes = {
@@ -11,6 +17,11 @@ type PropTypes = {
 }
 
 export default function School({ school, asClient = false }: PropTypes) {
+    const updateCmsImageAction = configureAction(
+        updateSchoolCmsImageAction,
+        { implementationParams: { shortName: school.shortName } }
+    )
+
     return (
         <div className={styles.School}>
             {
@@ -20,21 +31,41 @@ export default function School({ school, asClient = false }: PropTypes) {
                         classNameImage={styles.image}
                         cmsImage={school.cmsImage}
                         width={200}
+                        updateCmsImageAction={updateCmsImageAction}
                     />
                 ) : <CmsImage
                     className={styles.cmsImage}
                     classNameImage={styles.image}
                     cmsImage={school.cmsImage}
                     width={200}
+                    updateCmsImageAction={updateCmsImageAction}
                 />
             }
 
             <div className={styles.text}>
                 <div className={styles.name}>
-                    <h2>{school.name}</h2> <p>({school.shortname})</p>
+                    <h2>{school.name}</h2> <p>({school.shortName})</p>
                 </div>
-                <CmsParagraph cmsParagraph={school.cmsParagraph} />
-                <CmsLink cmsLink={school.cmsLink} className={styles.cmsLink} color="primary"/>
+                <CmsParagraph
+                    cmsParagraph={school.cmsParagraph}
+                    updateCmsParagraphAction={
+                        configureAction(
+                            updateSchoolCmsParagraphContentAction,
+                            { implementationParams: { shortName: school.shortName } }
+                        )
+                    }
+                />
+                <CmsLink
+                    cmsLink={school.cmsLink}
+                    className={styles.cmsLink}
+                    color="primary"
+                    updateCmsLinkAction={
+                        configureAction(
+                            updateSchoolCmsLinkAction,
+                            { implementationParams: { shortName: school.shortName } }
+                        )
+                    }
+                />
             </div>
         </div>
     )
diff --git a/src/app/_components/School/SchoolListRenderer.tsx b/src/app/_components/School/SchoolListRenderer.tsx
index 204cdfd90..ca8826a69 100644
--- a/src/app/_components/School/SchoolListRenderer.tsx
+++ b/src/app/_components/School/SchoolListRenderer.tsx
@@ -8,4 +8,4 @@ import type { ExpandedSchool } from '@/services/education/schools/types'
  */
 // eslint-disable-next-line react/display-name
 export const schoolListRenderer = (asClient: boolean) => (school: ExpandedSchool) =>
-    <School key={school.shortname} asClient={asClient} school={school} />
+    <School key={school.shortName} asClient={asClient} school={school} />
diff --git a/src/app/admin/cabin-booking/[booking]/page.tsx b/src/app/admin/cabin-booking/[booking]/page.tsx
index a1c2cf1e0..1e0f7453e 100644
--- a/src/app/admin/cabin-booking/[booking]/page.tsx
+++ b/src/app/admin/cabin-booking/[booking]/page.tsx
@@ -3,9 +3,9 @@ import PageWrapper from '@/app/_components/PageWrapper/PageWrapper'
 import SimpleTable from '@/app/_components/Table/SimpleTable'
 import { unwrapActionReturn } from '@/app/redirectToErrorPage'
 import { displayDate } from '@/lib/dates/displayDate'
+import { formatVevenUri } from '@/lib/urlEncoding'
 import Link from 'next/link'
 import React from 'react'
-import { formatVevenUri } from '@/lib/urlEncoding'
 
 function trHelper(key: string, value: React.ReactNode) {
     return <tr>
diff --git a/src/app/admin/schools/SchoolAdminList.tsx b/src/app/admin/schools/SchoolAdminList.tsx
index 7bc81de33..108ac927b 100644
--- a/src/app/admin/schools/SchoolAdminList.tsx
+++ b/src/app/admin/schools/SchoolAdminList.tsx
@@ -18,11 +18,11 @@ export async function SchoolAdminList({ schools }: PropTypes) {
             </thead>
             <tbody>
                 {schools.map(school => (
-                    <Link key={school.shortname} href={`/admin/schools/${encodeURIComponent(school.shortname)}`}>
+                    <Link key={school.shortName} href={`/admin/schools/${encodeURIComponent(school.shortName)}`}>
                         <tr key={school.id}>
                             <td>{school.id}</td>
                             <td>{school.name}</td>
-                            <td>{school.shortname}</td>
+                            <td>{school.shortName}</td>
                         </tr>
                     </Link>
                 ))}
diff --git a/src/app/admin/schools/[shortname]/UpdateSchool.tsx b/src/app/admin/schools/[shortname]/UpdateSchool.tsx
index a3cdb1249..ee1709444 100644
--- a/src/app/admin/schools/[shortname]/UpdateSchool.tsx
+++ b/src/app/admin/schools/[shortname]/UpdateSchool.tsx
@@ -15,10 +15,10 @@ export default function UpdateSchool({ school }: PropTypes) {
         <Form
             submitText="Oppdater"
             action={updateAction}
-            navigateOnSuccess={data => (data ? `/admin/schools/${data.shortname}` : '/admin/schools')}
+            navigateOnSuccess={data => (data ? `/admin/schools/${data.shortName}` : '/admin/schools')}
         >
             <TextInput name="name" label="navn" defaultValue={school.name} />
-            <TextInput name="shortname" label="kortnavn" defaultValue={school.shortname} />
+            <TextInput name="shortName" label="kortnavn" defaultValue={school.shortName} />
         </Form>
     )
 }
diff --git a/src/app/admin/schools/[shortname]/page.tsx b/src/app/admin/schools/[shortname]/page.tsx
index 411e11e33..0ac01b867 100644
--- a/src/app/admin/schools/[shortname]/page.tsx
+++ b/src/app/admin/schools/[shortname]/page.tsx
@@ -7,14 +7,14 @@ import School from '@/components/School/School'
 
 type PropTypes = {
     params: Promise<{
-        shortname: string
+        shortName: string
     }>
 }
 
 export default async function SchoolAdmin({ params }: PropTypes) {
-    const shortname = decodeURIComponent((await params).shortname)
+    const shortName = decodeURIComponent((await params).shortName)
 
-    const res = await readSchoolAction(shortname)
+    const res = await readSchoolAction({ params: { shortName } })
     if (!res.success) throw new Error(res.error?.length ? res.error[0].message : 'Unknown error')
     const school = res.data
 
diff --git a/src/app/admin/schools/page.tsx b/src/app/admin/schools/page.tsx
index e57c16746..fed83ad0a 100644
--- a/src/app/admin/schools/page.tsx
+++ b/src/app/admin/schools/page.tsx
@@ -25,7 +25,7 @@ export default async function SchoolsAdmin() {
                     refreshOnSuccess
                 >
                     <TextInput label="Navn" name="name" />
-                    <TextInput label="Kortnavn" name="shortname" />
+                    <TextInput label="Kortnavn" name="shortName" />
                 </Form>
             </AddHeaderItemPopUp>
         }>
diff --git a/src/app/applications/[periodName]/countdown/CommitteeLogoRoll.tsx b/src/app/applications/[periodName]/countdown/CommitteeLogoRoll.tsx
index c631ad008..86039f1a9 100644
--- a/src/app/applications/[periodName]/countdown/CommitteeLogoRoll.tsx
+++ b/src/app/applications/[periodName]/countdown/CommitteeLogoRoll.tsx
@@ -8,7 +8,7 @@ import type { Image as ImageT } from '@prisma/client'
 
 type PropTypes = {
     committees: {
-        shortname: string,
+        shortName: string,
         logo: ImageT
     }[],
     periodName: string
@@ -100,7 +100,7 @@ export default function CommitteeLogoRoll({ committees, periodName }: PropTypes)
                         </>) : (
                             <Display
                                 image={committees[currentCommitteeIndexes.display1].logo}
-                                shortname={committees[currentCommitteeIndexes.display1].shortname}
+                                shortName={committees[currentCommitteeIndexes.display1].shortName}
                             />
                         )
                     }
@@ -115,7 +115,7 @@ export default function CommitteeLogoRoll({ committees, periodName }: PropTypes)
                         </>) : (
                             <Display
                                 image={committees[currentCommitteeIndexes.display2].logo}
-                                shortname={committees[currentCommitteeIndexes.display2].shortname}
+                                shortName={committees[currentCommitteeIndexes.display2].shortName}
                             />
                         )
                     }
@@ -130,7 +130,7 @@ export default function CommitteeLogoRoll({ committees, periodName }: PropTypes)
                         </>) : (
                             <Display
                                 image={committees[currentCommitteeIndexes.display3].logo}
-                                shortname={committees[currentCommitteeIndexes.display3].shortname}
+                                shortName={committees[currentCommitteeIndexes.display3].shortName}
                             />
                         )
                     }
@@ -141,11 +141,11 @@ export default function CommitteeLogoRoll({ committees, periodName }: PropTypes)
 }
 
 
-function Display({ image, shortname }: { image: ImageT, shortname: string }) {
+function Display({ image, shortName }: { image: ImageT, shortName: string }) {
     return (
         <>
             <Image width={600} image={image} />
-            <span>{shortname}</span>
+            <span>{shortName}</span>
         </>
     )
 }
diff --git a/src/app/applications/[periodName]/countdown/Countdown.tsx b/src/app/applications/[periodName]/countdown/Countdown.tsx
index 4b991fefc..090c44e8b 100644
--- a/src/app/applications/[periodName]/countdown/Countdown.tsx
+++ b/src/app/applications/[periodName]/countdown/Countdown.tsx
@@ -38,7 +38,7 @@ export default function Countdown({ period, defaultCommitteeLogo }: PropTypes) {
                 <Speedlines />
                 {showCommitteeRoll && (
                     <CommitteeLogoRoll periodName={period.name} committees={period.committeesParticipating.map(part => ({
-                        shortname: part.committee.shortName,
+                        shortName: part.committee.shortName,
                         logo: part.committee.logoImage.image || defaultCommitteeLogo
                     }))} />
                 )}
diff --git a/src/app/applications/[periodName]/page.tsx b/src/app/applications/[periodName]/page.tsx
index 1e4662621..5813a4af2 100644
--- a/src/app/applications/[periodName]/page.tsx
+++ b/src/app/applications/[periodName]/page.tsx
@@ -18,13 +18,14 @@ import {
     destroyApplicationAction,
     readApplicationsForUserAction
 } from '@/services/applications/actions'
-import { readCommitteesAction } from '@/services/groups/committees/actions'
+import { readAllCommitteesAction, updateCommitteeParagraphAction } from '@/services/groups/committees/actions'
 import {
     destroyApplicationPeriodAction,
     removeAllApplicationTextsAction,
     readApplicationPeriodAction
 } from '@/services/applications/periods/actions'
 import { readSpecialImageAction } from '@/services/images/actions'
+import { configureAction } from '@/services/configureAction'
 import { faVideo } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
@@ -46,7 +47,7 @@ export default async function ApplicationPeriod({ params }: PropTypes) {
     const applications = userId ? unwrapActionReturn(
         await readApplicationsForUserAction({ params: { userId, periodId: period.id } })
     ) : []
-    const committees = unwrapActionReturn(await readCommitteesAction())
+    const committees = unwrapActionReturn(await readAllCommitteesAction())
 
     const periodWithApplications = {
         ...period,
@@ -162,6 +163,12 @@ export default async function ApplicationPeriod({ params }: PropTypes) {
                                     <h1>{part.committee.name}</h1>
                                     <CmsParagraph
                                         cmsParagraph={part.committee.paragraph}
+                                        updateCmsParagraphAction={
+                                            configureAction(
+                                                updateCommitteeParagraphAction,
+                                                { implementationParams: { shortName: part.committee.shortName } }
+                                            )
+                                        }
                                     />
                                     <div className={styles.navigation}>
                                         {
diff --git a/src/app/applications/page.tsx b/src/app/applications/page.tsx
index 03080cc82..46666edd6 100644
--- a/src/app/applications/page.tsx
+++ b/src/app/applications/page.tsx
@@ -5,11 +5,11 @@ import { readApplicationPeriodsAction } from '@/services/applications/periods/ac
 import PageWrapper from '@/components/PageWrapper/PageWrapper'
 import Date from '@/components/Date/Date'
 import { AddHeaderItemPopUp } from '@/components/HeaderItems/HeaderItemPopUp'
-import { readCommitteesAction } from '@/services/groups/committees/actions'
+import { readAllCommitteesAction } from '@/services/groups/committees/actions'
 
-export default async function Apllications() {
+export default async function Applications() {
     const periods = unwrapActionReturn(await readApplicationPeriodsAction())
-    const committees = unwrapActionReturn(await readCommitteesAction())
+    const committees = unwrapActionReturn(await readAllCommitteesAction())
 
     return (
         <PageWrapper title="Søknadsperioder" headerItem={
diff --git a/src/app/articles/AddCategory.tsx b/src/app/articles/AddCategory.tsx
index 0ca7d431f..1b4659e68 100644
--- a/src/app/articles/AddCategory.tsx
+++ b/src/app/articles/AddCategory.tsx
@@ -3,7 +3,7 @@ import styles from './AddCategory.module.scss'
 import Form from '@/components/Form/Form'
 import TextInput from '@/components/UI/TextInput'
 import Textarea from '@/components/UI/Textarea'
-import { createArticleCategoryAction } from '@/services/cms/articleCategories/actions'
+import { createArticleCategoryAction } from '@/services/articleCategories/actions'
 import { useRouter } from 'next/navigation'
 
 export default function AddCategory() {
diff --git a/src/app/articles/[category]/EditCategory.tsx b/src/app/articles/[category]/EditCategory.tsx
index dc4ebdee4..bee6c69f4 100644
--- a/src/app/articles/[category]/EditCategory.tsx
+++ b/src/app/articles/[category]/EditCategory.tsx
@@ -3,12 +3,16 @@ import Form from '@/components/Form/Form'
 import PopUp from '@/components/PopUp/PopUp'
 import Textarea from '@/components/UI/Textarea'
 import TextInput from '@/components/UI/TextInput'
-import { updateArticleCategoryAction, destroyArticleCategoryAction } from '@/services/cms/articleCategories/actions'
-import { createArticleAction } from '@/services/cms/articles/actions'
+import {
+    updateArticleCategoryAction,
+    destroyArticleCategoryAction,
+    addArticleToCategoryAction
+} from '@/services/articleCategories/actions'
+import { configureAction } from '@/services/configureAction'
 import { useRouter } from 'next/navigation'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faCog } from '@fortawesome/free-solid-svg-icons'
-import type { ExpandedArticleCategory } from '@/cms/articleCategories/types'
+import type { ExpandedArticleCategory } from '@/services/articleCategories/types'
 
 type PropTypes = {
     category: ExpandedArticleCategory
@@ -33,13 +37,19 @@ export default function EditCategory({ category }: PropTypes) {
 
     if (!canEditCategory) return null
 
-    const updateCategory = updateArticleCategoryAction.bind(null, category.id)
+    const updateCategory = configureAction(
+        updateArticleCategoryAction,
+        { params: { id: category.id } }
+    )
 
     return (
         <>
             <li className={styles.newArticle}>
                 <Form
-                    action={createArticleAction.bind(null, {}).bind(null, category.id)}
+                    action={configureAction(
+                        addArticleToCategoryAction,
+                        { params: { id: category.id } }
+                    )}
                     successCallback={refresh}
                     submitText="Lag ny artikkel"
                 />
@@ -68,7 +78,10 @@ export default function EditCategory({ category }: PropTypes) {
             </PopUp>
             <li>
                 <Form
-                    action={destroyArticleCategoryAction.bind(null, category.id)}
+                    action={configureAction(
+                        destroyArticleCategoryAction,
+                        { params: { id: category.id } }
+                    )}
                     successCallback={handleSuccessDestroy}
                     submitText="Slett kategori"
                     submitColor="red"
diff --git a/src/app/articles/[category]/SideBar.tsx b/src/app/articles/[category]/SideBar.tsx
index c2a74bf4a..791a3a2fe 100644
--- a/src/app/articles/[category]/SideBar.tsx
+++ b/src/app/articles/[category]/SideBar.tsx
@@ -4,13 +4,14 @@ import EditCategory from './EditCategory'
 import useScroll from '@/hooks/useScroll'
 import useOnNavigation from '@/hooks/useOnNavigation'
 import useViewPort from '@/hooks/useViewPort'
-import { destroyArticleAction } from '@/services/cms/articles/actions'
+import { removeArticleFromCategoryAction } from '@/services/articleCategories/actions'
+import { formatVevenUri } from '@/lib/urlEncoding'
 import React, { useRef, useState } from 'react'
 import Link from 'next/link'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faChevronUp, faX } from '@fortawesome/free-solid-svg-icons'
 import { useRouter } from 'next/navigation'
-import type { ExpandedArticleCategory } from '@/cms/articleCategories/types'
+import type { ExpandedArticleCategory } from '@/services/articleCategories/types'
 
 type PropTypes = {
     category: ExpandedArticleCategory
@@ -78,7 +79,7 @@ function MainListContent({ category }: { category: ExpandedArticleCategory }) {
     const { push, refresh } = useRouter()
 
     const handleDestroy = async (id: number) => {
-        const res = await destroyArticleAction(id)
+        const res = await removeArticleFromCategoryAction({ params: { id: category.id, articleId: id } })
         if (!res.success) throw new Error('could not destroy article')
         push(`/articles/${category.name}`)
         refresh()
@@ -89,7 +90,7 @@ function MainListContent({ category }: { category: ExpandedArticleCategory }) {
             {
                 category.articles.map(article => (
                     <li key={article.id}>
-                        <Link href={`/articles/${category.name}/${article.name}`}>
+                        <Link href={`/articles/${category.name}/${formatVevenUri(article.name, article.id)}`}>
                             {article.name.toUpperCase()}
                         </Link>
                         {
diff --git a/src/app/articles/[category]/[name]/page.module.scss b/src/app/articles/[category]/[nameAndId]/page.module.scss
similarity index 100%
rename from src/app/articles/[category]/[name]/page.module.scss
rename to src/app/articles/[category]/[nameAndId]/page.module.scss
diff --git a/src/app/articles/[category]/[nameAndId]/page.tsx b/src/app/articles/[category]/[nameAndId]/page.tsx
new file mode 100644
index 000000000..1bb79a04d
--- /dev/null
+++ b/src/app/articles/[category]/[nameAndId]/page.tsx
@@ -0,0 +1,100 @@
+import styles from './page.module.scss'
+import Article from '@/cms/Article/Article'
+import { configureAction } from '@/services/configureAction'
+import {
+    readArticleCategoryAction,
+    readArticleInCategoryAction,
+    updateArticleCategoryArticleAction,
+    updateArticleCategoryArticleAddSectionAction,
+    updateArticleCategoryArticleCmsImageAction,
+    updateArticleCategoryArticleCmsLinkAction,
+    updateArticleCategoryArticleCmsParagraphAction,
+    updateArticleCategoryArticleCoverImageAction,
+    updateArticleCategoryArticleReorderSectionsAction,
+    updateArticleCategoryArticleSectionAction,
+    updateArticleCategoryArticleSectionsAddPartAction,
+    updateArticleCategoryArticleSectionsRemovePartAction
+} from '@/services/articleCategories/actions'
+import { decodeVevenUriHandleError } from '@/lib/urlEncoding'
+import { unwrapActionReturn } from '@/app/redirectToErrorPage'
+
+type PropTypes = {
+    params: Promise<{
+        category: string
+        nameAndId: string
+    }>,
+}
+
+export default async function ArticleCategoryPage({ params }: PropTypes) {
+    const articleId = decodeVevenUriHandleError((await params).nameAndId)
+    const categoryName = decodeURIComponent((await params).category)
+
+    const articleCategory = unwrapActionReturn(
+        await readArticleCategoryAction({ params: { name: categoryName } })
+    )
+
+    const article = unwrapActionReturn(
+        await readArticleInCategoryAction({
+            implementationParams: {
+                articleCategoryName: categoryName
+            }
+        }, {
+            params: {
+                articleId,
+            }
+        })
+    )
+
+    return (
+        <div className={styles.wrapper}>
+            <Article
+                coverImageClass={styles.coverImage}
+                article={article}
+                actions={{
+                    updateArticleAction: configureAction(
+                        updateArticleCategoryArticleAction,
+                        { implementationParams: { articleCategoryId: articleCategory.id } }
+                    ),
+                    updateCoverImageAction: configureAction(
+                        updateArticleCategoryArticleCoverImageAction,
+                        { implementationParams: { articleCategoryId: articleCategory.id } }
+                    ),
+                    addSectionToArticleAction: configureAction(
+                        updateArticleCategoryArticleAddSectionAction,
+                        { implementationParams: { articleCategoryId: articleCategory.id } }
+                    ),
+                    reorderArticleSectionsAction: configureAction(
+                        updateArticleCategoryArticleReorderSectionsAction,
+                        { implementationParams: { articleCategoryId: articleCategory.id } }
+                    ),
+                    articleSections: {
+                        updateCmsParagraph: configureAction(
+                            updateArticleCategoryArticleCmsParagraphAction,
+                            { implementationParams: { articleCategoryId: articleCategory.id } }
+                        ),
+                        updateCmsImage: configureAction(
+                            updateArticleCategoryArticleCmsImageAction,
+                            { implementationParams: { articleCategoryId: articleCategory.id } }
+                        ),
+                        updateCmsLink: configureAction(
+                            updateArticleCategoryArticleCmsLinkAction,
+                            { implementationParams: { articleCategoryId: articleCategory.id } }
+                        ),
+                        updateArticleSection: configureAction(
+                            updateArticleCategoryArticleSectionAction,
+                            { implementationParams: { articleCategoryId: articleCategory.id } }
+                        ),
+                        addPartToArticleSection: configureAction(
+                            updateArticleCategoryArticleSectionsAddPartAction,
+                            { implementationParams: { articleCategoryId: articleCategory.id } }
+                        ),
+                        removePartFromArticleSection: configureAction(
+                            updateArticleCategoryArticleSectionsRemovePartAction,
+                            { implementationParams: { articleCategoryId: articleCategory.id } }
+                        )
+                    }
+                }}
+            />
+        </div>
+    )
+}
diff --git a/src/app/articles/[category]/[name]/page.tsx b/src/app/articles/[category]/[name]/page.tsx
deleted file mode 100644
index a0104c511..000000000
--- a/src/app/articles/[category]/[name]/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import styles from './page.module.scss'
-import Article from '@/cms/Article/Article'
-import { readArticleAction } from '@/cms/articles/actions'
-import { notFound } from 'next/navigation'
-
-type PropTypes = {
-    params: Promise<{
-        category: string
-        name: string
-    }>,
-}
-
-export default async function ArticleCategorArticley({ params }: PropTypes) {
-    //This fixes æ, ø, å and spaces in the url
-    const name = decodeURIComponent((await params).name)
-    const category = decodeURIComponent((await params).category)
-    const res = await readArticleAction({
-        name,
-        category
-    })
-    if (!res.success) return notFound()
-
-    return (
-        <div className={styles.wrapper}>
-            <Article coverImageClass={styles.coverImage} article={res.data} />
-        </div>
-    )
-}
diff --git a/src/app/articles/[category]/layout.tsx b/src/app/articles/[category]/layout.tsx
index c3539e44c..8bbc894bd 100644
--- a/src/app/articles/[category]/layout.tsx
+++ b/src/app/articles/[category]/layout.tsx
@@ -1,6 +1,6 @@
 import styles from './layout.module.scss'
 import SideBar from './SideBar'
-import { readArticleCategoryAction } from '@/cms/articleCategories/actions'
+import { readArticleCategoryAction } from '@/services/articleCategories/actions'
 import { notFound } from 'next/navigation'
 import type { ReactNode } from 'react'
 
@@ -13,7 +13,7 @@ type PropTypes = {
 
 export default async function ArticleCategoryLayout({ params, children }: PropTypes) {
     const categoryName = decodeURIComponent((await params).category)
-    const res = await readArticleCategoryAction(categoryName)
+    const res = await readArticleCategoryAction({ params: { name: categoryName } })
     if (!res.success) return notFound()
     const category = res.data
 
diff --git a/src/app/articles/page.tsx b/src/app/articles/page.tsx
index 6e9cc1812..6fc41e7bb 100644
--- a/src/app/articles/page.tsx
+++ b/src/app/articles/page.tsx
@@ -2,7 +2,7 @@ import styles from './page.module.scss'
 import AddCategory from './AddCategory'
 import { AddHeaderItemPopUp } from '@/components/HeaderItems/HeaderItemPopUp'
 import ImageCard from '@/components/ImageCard/ImageCard'
-import { readArticleCategoriesAction } from '@/cms/articleCategories/actions'
+import { readArticleCategoriesAction } from '@/services/articleCategories/actions'
 import PageWrapper from '@/components/PageWrapper/PageWrapper'
 
 export default async function ArticleCategoryList() {
diff --git a/src/app/cabin/book/page.tsx b/src/app/cabin/book/page.tsx
index e9c115055..96a2fc06e 100644
--- a/src/app/cabin/book/page.tsx
+++ b/src/app/cabin/book/page.tsx
@@ -2,11 +2,14 @@ import StateWrapper from './stateWrapper'
 import SpecialCmsParagraph from '@/app/_components/Cms/CmsParagraph/SpecialCmsParagraph'
 import PageWrapper from '@/components/PageWrapper/PageWrapper'
 import { unwrapActionReturn } from '@/app/redirectToErrorPage'
+import { default as DateComponent } from '@/components/Date/Date'
 import {
     readCabinAvailabilityAction,
     readCabinProductsActiveAction,
     readPublicPricePeriodsAction,
-    readReleasePeriodsAction
+    readReleasePeriodsAction,
+    readSpecialCmsParagraphCabinContractAction,
+    updateSpecialCmsParagraphCabinContractAction
 } from '@/services/cabin/actions'
 import { displayDate } from '@/lib/dates/displayDate'
 import { Session } from '@/auth/session/Session'
@@ -49,8 +52,8 @@ export default async function CabinBooking() {
     >
         {nextReleasePeriod &&
             <p>
-                Neste slipptid er {displayDate(nextReleasePeriod.releaseTime, false)},
-                da slippes bookinger fram til {displayDate(nextReleasePeriod.releaseUntil, false)}
+                Neste slipptid er <DateComponent date={nextReleasePeriod.releaseTime} />,
+                da slippes bookinger fram til <DateComponent date={nextReleasePeriod.releaseUntil} />
             </p>
         }
         {pricePeriods.length > 1 &&
@@ -67,6 +70,10 @@ export default async function CabinBooking() {
             pricePeriods={pricePeriods}
         />
 
-        <SpecialCmsParagraph special="CABIN_CONTRACT" />
+        <SpecialCmsParagraph
+            special="CABIN_CONTRACT"
+            readSpecialCmsParagraphAction={readSpecialCmsParagraphCabinContractAction}
+            updateCmsParagraphAction={updateSpecialCmsParagraphCabinContractAction}
+        />
     </PageWrapper>
 }
diff --git a/src/app/career/jobads/[nameAndId]/EditJobAd.tsx b/src/app/career/jobads/[nameAndId]/EditJobAd.tsx
index 471c97b33..6f8162f92 100644
--- a/src/app/career/jobads/[nameAndId]/EditJobAd.tsx
+++ b/src/app/career/jobads/[nameAndId]/EditJobAd.tsx
@@ -13,10 +13,10 @@ import CompanyChooser from '@/app/career/jobads/CompanyChooser'
 import { destroyJobAdAction, updateJobAdAction } from '@/career/jobAds/actions'
 import { jobAdOptions } from '@/services/career/jobAds/constants'
 import { configureAction } from '@/services/configureAction'
+import { formatVevenUri } from '@/lib/urlEncoding'
 import { v4 as uuid } from 'uuid'
 import { useContext, type ReactNode } from 'react'
 import type { ExpandedJobAd } from '@/services/career/jobAds/types'
-import { formatVevenUri } from '@/lib/urlEncoding'
 
 type PropTypes = {
     jobAd: ExpandedJobAd
diff --git a/src/app/career/jobads/[nameAndId]/page.tsx b/src/app/career/jobads/[nameAndId]/page.tsx
index 8aa7198ec..5c32122a2 100644
--- a/src/app/career/jobads/[nameAndId]/page.tsx
+++ b/src/app/career/jobads/[nameAndId]/page.tsx
@@ -1,4 +1,3 @@
-
 import styles from './page.module.scss'
 import EditJobAd from './EditJobAd'
 import Article from '@/components/Cms/Article/Article'
@@ -7,8 +6,22 @@ import { CompanyPagingProvider } from '@/contexts/paging/CompanyPaging'
 import Company from '@/components/Company/Company'
 import Date from '@/components/Date/Date'
 import { Session } from '@/auth/session/Session'
-import { readJobAdAction } from '@/services/career/jobAds/actions'
+import {
+    readJobAdAction,
+    updateJobAdArticleAction,
+    updateJobAdArticleAddSectionAction,
+    updateJobAdArticleCmsImageAction,
+    updateJobAdArticleCmsLinkAction,
+    updateJobAdArticleCmsParagraphAction,
+    updateJobAdArticleCoverImageAction,
+    updateJobAdArticleReorderSectionsAction,
+    updateJobAdArticleSectionAction,
+    updateJobAdArticleSectionsAddPartAction,
+    updateJobAdArticleSectionsRemovePartAction
+} from '@/services/career/jobAds/actions'
 import { jobAdType } from '@/services/career/jobAds/constants'
+import { decodeVevenUriHandleError } from '@/lib/urlEncoding'
+import { configureAction } from '@/services/configureAction'
 import { notFound } from 'next/navigation'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import {
@@ -19,7 +32,6 @@ import {
     faSuitcase,
     faXmarkCircle
 } from '@fortawesome/free-solid-svg-icons'
-import { decodeVevenUriHandleError } from '@/lib/urlEncoding'
 
 type PropTypes = {
     params: Promise<{
@@ -27,7 +39,6 @@ type PropTypes = {
     }>
 }
 
-
 export default async function JobAd({ params }: PropTypes) {
     const nameAndId = (await params).nameAndId
 
@@ -42,54 +53,101 @@ export default async function JobAd({ params }: PropTypes) {
     return (
         <div className={styles.wrapper}>
             <main>
-                <Article article={jobAd.article} sideBarClassName={styles.sideBar} sideBarContent={
-                    <>
-                        <ul className={styles.metInfo}>
-                            <li>
-                                <FontAwesomeIcon icon={faSuitcase} />
-                                <h3>Stillingstype</h3>
-                                <p>{jobAdType[jobAd.type].label}</p>
-                            </li>
-                            <li>
-                                <FontAwesomeIcon icon={jobAd.active ? faCheckCircle : faXmarkCircle} />
-                                <h3>Status</h3>
-                                <p>{jobAd.active ? 'Denne jobbanonsen er aktiv' : 'Denne jobbanonsen er arkivert'}</p>
-                            </li>
-                            <li>
-                                <FontAwesomeIcon icon={faClock} />
-                                <h3>Søknadsfrist</h3>
-                                <p>
-                                    { jobAd.applicationDeadline ?
-                                        <Date date={jobAd.applicationDeadline} /> :
-                                        'Ingen søknadsfrist satt'
-                                    }
-                                </p>
-                            </li>
-                            <li>
-                                <FontAwesomeIcon icon={faNewspaper} />
-                                <h3>Publisert</h3>
-                                <p>
-                                    <Date date={jobAd.createdAt} />
-                                </p>
-                            </li>
-                            <li>
-                                <FontAwesomeIcon icon={faLocationDot} />
-                                <h3>Sted</h3>
-                                <p>{jobAd.location}</p>
-                            </li>
-                        </ul>
-                        <div className={styles.company}>
-                            <h2>Arbeidsgiver</h2>
-                            <Company
-                                disableEdit
-                                squareLogo={false}
-                                company={jobAd.company}
-                                asClient={false}
-                                session={session}
-                            />
-                        </div>
-                    </>
-                } />
+                <Article
+                    article={jobAd.article}
+                    sideBarClassName={styles.sideBar}
+                    actions={{
+                        updateArticleAction: configureAction(
+                            updateJobAdArticleAction,
+                            { implementationParams: { jobAdId: jobAd.id } }
+                        ),
+                        updateCoverImageAction: configureAction(
+                            updateJobAdArticleCoverImageAction,
+                            { implementationParams: { jobAdId: jobAd.id } }
+                        ),
+                        addSectionToArticleAction: configureAction(
+                            updateJobAdArticleAddSectionAction,
+                            { implementationParams: { jobAdId: jobAd.id } }
+                        ),
+                        reorderArticleSectionsAction: configureAction(
+                            updateJobAdArticleReorderSectionsAction,
+                            { implementationParams: { jobAdId: jobAd.id } }
+                        ),
+                        articleSections: {
+                            updateCmsParagraph: configureAction(
+                                updateJobAdArticleCmsParagraphAction,
+                                { implementationParams: { jobAdId: jobAd.id } }
+                            ),
+                            updateCmsImage: configureAction(
+                                updateJobAdArticleCmsImageAction,
+                                { implementationParams: { jobAdId: jobAd.id } }
+                            ),
+                            updateCmsLink: configureAction(
+                                updateJobAdArticleCmsLinkAction,
+                                { implementationParams: { jobAdId: jobAd.id } }
+                            ),
+                            updateArticleSection: configureAction(
+                                updateJobAdArticleSectionAction,
+                                { implementationParams: { jobAdId: jobAd.id } }
+                            ),
+                            addPartToArticleSection: configureAction(
+                                updateJobAdArticleSectionsAddPartAction,
+                                { implementationParams: { jobAdId: jobAd.id } }
+                            ),
+                            removePartFromArticleSection: configureAction(
+                                updateJobAdArticleSectionsRemovePartAction,
+                                { implementationParams: { jobAdId: jobAd.id } }
+                            )
+                        }
+                    }}
+                    sideBarContent={
+                        <>
+                            <ul className={styles.metInfo}>
+                                <li>
+                                    <FontAwesomeIcon icon={faSuitcase} />
+                                    <h3>Stillingstype</h3>
+                                    <p>{jobAdType[jobAd.type].label}</p>
+                                </li>
+                                <li>
+                                    <FontAwesomeIcon icon={jobAd.active ? faCheckCircle : faXmarkCircle} />
+                                    <h3>Status</h3>
+                                    <p>{jobAd.active ? 'Denne jobbanonsen er aktiv' : 'Denne jobbanonsen er arkivert'}</p>
+                                </li>
+                                <li>
+                                    <FontAwesomeIcon icon={faClock} />
+                                    <h3>Søknadsfrist</h3>
+                                    <p>
+                                        { jobAd.applicationDeadline ?
+                                            <Date date={jobAd.applicationDeadline} /> :
+                                            'Ingen søknadsfrist satt'
+                                        }
+                                    </p>
+                                </li>
+                                <li>
+                                    <FontAwesomeIcon icon={faNewspaper} />
+                                    <h3>Publisert</h3>
+                                    <p>
+                                        <Date date={jobAd.createdAt} />
+                                    </p>
+                                </li>
+                                <li>
+                                    <FontAwesomeIcon icon={faLocationDot} />
+                                    <h3>Sted</h3>
+                                    <p>{jobAd.location}</p>
+                                </li>
+                            </ul>
+                            <div className={styles.company}>
+                                <h2>Arbeidsgiver</h2>
+                                <Company
+                                    disableEdit
+                                    squareLogo={false}
+                                    company={jobAd.company}
+                                    asClient={false}
+                                    session={session}
+                                />
+                            </div>
+                        </>
+                    } />
             </main>
             <CompanyPagingProvider
                 serverRenderedData={[]}
diff --git a/src/app/career/page.tsx b/src/app/career/page.tsx
index 47cd93712..f989f67c9 100644
--- a/src/app/career/page.tsx
+++ b/src/app/career/page.tsx
@@ -6,8 +6,9 @@ import Image from '@/components/Image/Image'
 import CmsLink from '@/components/Cms/CmsLink/CmsLink'
 import { QueryParams } from '@/lib/queryParams/queryParams'
 import { readSpecialImageAction } from '@/services/images/actions'
-import { readSpecialCmsLinkAction } from '@/services/cms/links/actions'
 import { readSpecialEventTagAction } from '@/services/events/tags/actions'
+import { readSpecialCmsParagraphCareerInfo, updateSpecialCmsParagraphContentCareerInfo } from '@/services/career/actions'
+import { readCompanySpecialCmsLinkAction, updateCompanySpecialCmsLinkAction } from '@/services/career/companies/actions'
 import Link from 'next/link'
 
 export default async function CareerLandingPage() {
@@ -15,7 +16,7 @@ export default async function CareerLandingPage() {
     const jobAdImageRes = await readSpecialImageAction({ params: { special: 'MACHINE' } })
     const eventImageRes = await readSpecialImageAction({ params: { special: 'FAIR' } })
     const comanyImageRes = await readSpecialImageAction({ params: { special: 'REALFAGSBYGGET' } })
-    const conactorCmsLinkRes = await readSpecialCmsLinkAction({ params: { special: 'CAREER_LINK_TO_CONTACTOR' } })
+    const conactorCmsLinkRes = await readCompanySpecialCmsLinkAction({ params: { special: 'CAREER_LINK_TO_CONTACTOR' } })
     const companyPresentationEventTagRes = await readSpecialEventTagAction({ params: { special: 'COMPANY_PRESENTATION' } })
 
     const jobAdImage = jobAdImageRes.success ? jobAdImageRes.data : null
@@ -27,10 +28,18 @@ export default async function CareerLandingPage() {
     return (
         <PageWrapper title={session.user ? 'Karriere' : 'For bedrifter'} headerItem={
             contactorCmsLink ? <CmsLink
-                className={styles.conactorLink} cmsLink={contactorCmsLink} /> : <></>
+                className={styles.conactorLink}
+                cmsLink={contactorCmsLink}
+                updateCmsLinkAction={updateCompanySpecialCmsLinkAction}
+            /> : <></>
         }>
             <div className={styles.wrapper}>
-                <SpecialCmsParagraph className={styles.info} special="CAREER_INFO" />
+                <SpecialCmsParagraph
+                    className={styles.info}
+                    special="CAREER_INFO"
+                    readSpecialCmsParagraphAction={readSpecialCmsParagraphCareerInfo}
+                    updateCmsParagraphAction={updateSpecialCmsParagraphContentCareerInfo}
+                />
                 <span className={styles.links}>
                     <Link href="/career/jobads">
                         { jobAdImage ? <Image
diff --git a/src/app/committees/[shortName]/about/page.tsx b/src/app/committees/[shortName]/about/page.tsx
index 3ccec592b..1929c28fd 100644
--- a/src/app/committees/[shortName]/about/page.tsx
+++ b/src/app/committees/[shortName]/about/page.tsx
@@ -1,6 +1,19 @@
 import styles from './page.module.scss'
-import { readCommitteeArticleAction } from '@/services/groups/committees/actions'
+import {
+    readCommitteeArticleAction,
+    updateCommitteeArticleAction,
+    updateCommitteeArticleAddSectionAction,
+    updateCommitteeArticleCmsImageAction,
+    updateCommitteeArticleCmsLinkAction,
+    updateCommitteeArticleCmsParagraphAction,
+    updateCommitteeArticleCoverImageAction,
+    updateCommitteeArticleReorderSectionsAction,
+    updateCommitteeArticleSectionAction,
+    updateCommitteeArticleSectionsAddPartAction,
+    updateCommitteeArticleSectionsRemovePartAction
+} from '@/services/groups/committees/actions'
 import Article from '@/components/Cms/Article/Article'
+import { configureAction } from '@/services/configureAction'
 
 export type PropTypes = {
     params: Promise<{
@@ -9,13 +22,62 @@ export type PropTypes = {
 }
 
 export default async function committeeArticle({ params }: PropTypes) {
+    const shortName = (await params).shortName
     const committeeArticleRes = await readCommitteeArticleAction({ params: await params })
     if (!committeeArticleRes.success) throw new Error('Kunne ikke hente komitéartikkel')
     const article = committeeArticleRes.data
 
     return (
         <div className={styles.wrapper}>
-            <Article article={article} hideCoverImage noMargin />
+            <Article
+                article={article}
+                hideCoverImage
+                noMargin
+                actions={{
+                    updateArticleAction: configureAction(
+                        updateCommitteeArticleAction,
+                        { implementationParams: { shortName } }
+                    ),
+                    updateCoverImageAction: configureAction(
+                        updateCommitteeArticleCoverImageAction,
+                        { implementationParams: { shortName } }
+                    ),
+                    addSectionToArticleAction: configureAction(
+                        updateCommitteeArticleAddSectionAction,
+                        { implementationParams: { shortName } }
+                    ),
+                    reorderArticleSectionsAction: configureAction(
+                        updateCommitteeArticleReorderSectionsAction,
+                        { implementationParams: { shortName } }
+                    ),
+                    articleSections: {
+                        updateCmsParagraph: configureAction(
+                            updateCommitteeArticleCmsParagraphAction,
+                            { implementationParams: { shortName } }
+                        ),
+                        updateCmsImage: configureAction(
+                            updateCommitteeArticleCmsImageAction,
+                            { implementationParams: { shortName } }
+                        ),
+                        updateCmsLink: configureAction(
+                            updateCommitteeArticleCmsLinkAction,
+                            { implementationParams: { shortName } }
+                        ),
+                        updateArticleSection: configureAction(
+                            updateCommitteeArticleSectionAction,
+                            { implementationParams: { shortName } }
+                        ),
+                        addPartToArticleSection: configureAction(
+                            updateCommitteeArticleSectionsAddPartAction,
+                            { implementationParams: { shortName } }
+                        ),
+                        removePartFromArticleSection: configureAction(
+                            updateCommitteeArticleSectionsRemovePartAction,
+                            { implementationParams: { shortName } }
+                        )
+                    }
+                }}
+            />
         </div>
     )
 }
diff --git a/src/app/committees/[shortName]/admin/page.tsx b/src/app/committees/[shortName]/admin/page.tsx
index 5c4c4dc44..ae322933e 100644
--- a/src/app/committees/[shortName]/admin/page.tsx
+++ b/src/app/committees/[shortName]/admin/page.tsx
@@ -1,6 +1,8 @@
 import styles from './page.module.scss'
 import getCommittee from '@/app/committees/[shortName]/getCommittee'
 import CmsImage from '@/components/Cms/CmsImage/CmsImage'
+import { configureAction } from '@/services/configureAction'
+import { updateCommitteeLogoAction } from '@/services/groups/committees/actions'
 import type { PropTypes } from '@/app/committees/[shortName]/page'
 
 export default async function ComitteeAdmin({ params }: PropTypes) {
@@ -8,7 +10,16 @@ export default async function ComitteeAdmin({ params }: PropTypes) {
     return (
         <div className={styles.wrapper}>
             <h2>Admin</h2>
-            <CmsImage cmsImage={committee.logoImage} width={300} />
+            <CmsImage
+                cmsImage={committee.logoImage}
+                width={300}
+                updateCmsImageAction={
+                    configureAction(
+                        updateCommitteeLogoAction,
+                        { implementationParams: { shortName: committee.shortName } }
+                    )
+                }
+            />
         </div>
     )
 }
diff --git a/src/app/committees/[shortName]/layout.tsx b/src/app/committees/[shortName]/layout.tsx
index 0362fee6d..6c22a7ead 100644
--- a/src/app/committees/[shortName]/layout.tsx
+++ b/src/app/committees/[shortName]/layout.tsx
@@ -28,7 +28,7 @@ export default async function Committee({ params, children }: PropTypes) {
 
     return (
         <BackdropImage image={committeeLogo}>
-            <CommitteeImage logoImage={committeeLogo} coverImage={committee.coverImage} />
+            <CommitteeImage shortName={committee.shortName} logoImage={committeeLogo} coverImage={committee.coverImage} />
             <PageWrapper title={committee.name}>
                 <div className={styles.layout}>
                     <div className={styles.content}>
diff --git a/src/app/committees/[shortName]/page.tsx b/src/app/committees/[shortName]/page.tsx
index 99bc321ca..5c95822e0 100644
--- a/src/app/committees/[shortName]/page.tsx
+++ b/src/app/committees/[shortName]/page.tsx
@@ -1,8 +1,13 @@
 import styles from './page.module.scss'
-import { readCommitteeMembersAction, readCommitteeParagraphAction } from '@/services/groups/committees/actions'
+import {
+    readCommitteeMembersAction,
+    readCommitteeParagraphAction,
+    updateCommitteeParagraphAction
+} from '@/services/groups/committees/actions'
 import { unwrapActionReturn } from '@/app/redirectToErrorPage'
 import CmsParagraph from '@/components/Cms/CmsParagraph/CmsParagraph'
 import UserCard from '@/components/User/UserCard'
+import { configureAction } from '@/services/configureAction'
 
 export type PropTypes = {
     params: Promise<{
@@ -11,12 +16,11 @@ export type PropTypes = {
 }
 
 export default async function Committee({ params }: PropTypes) {
-    const paramsAwaited = (await params)
-    const paragraphRes = await readCommitteeParagraphAction({ params: paramsAwaited })
-    if (!paragraphRes.success) throw new Error('Kunne ikke hente komitéparagraph')
+    const paragraphRes = await readCommitteeParagraphAction({ params: await params })
+    if (!paragraphRes.success) throw new Error('Kunne ikke hente komitéparagrafen')
     const members = unwrapActionReturn(await readCommitteeMembersAction({
         params: {
-            shortName: paramsAwaited.shortName,
+            shortName: (await params).shortName,
             active: true,
         },
     }))
@@ -25,7 +29,13 @@ export default async function Committee({ params }: PropTypes) {
 
     return (
         <div className={styles.wrapper}>
-            <CmsParagraph cmsParagraph={paragraph} />
+            <CmsParagraph
+                cmsParagraph={paragraph}
+                updateCmsParagraphAction={configureAction(
+                    updateCommitteeParagraphAction,
+                    { implementationParams: { shortName: (await params).shortName } }
+                )}
+            />
 
             <h2>Komitémedlemmer</h2>
             <div className={styles.memberList}>
diff --git a/src/app/committees/page.tsx b/src/app/committees/page.tsx
index 1a10c1aaf..901b0edb2 100644
--- a/src/app/committees/page.tsx
+++ b/src/app/committees/page.tsx
@@ -1,10 +1,10 @@
 import styles from './page.module.scss'
 import CommitteeCard from '@/components/CommitteeCard/CommitteeCard'
-import { readCommitteesAction } from '@/services/groups/committees/actions'
+import { readAllCommitteesAction } from '@/services/groups/committees/actions'
 import { readSpecialImageAction } from '@/services/images/actions'
 
 export default async function Committees() {
-    const res = await readCommitteesAction()
+    const res = await readAllCommitteesAction()
     if (!res.success) throw new Error(`Kunne ikke hente komiteer - ${res.errorCode}`)
     const committees = res.data
 
diff --git a/src/app/error.tsx b/src/app/error.tsx
index caf8380c1..830eea3fe 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -2,6 +2,7 @@
 import styles from './error.module.scss'
 import Button from '@/components/UI/Button'
 import SpecialCmsImageClient from '@/components/Cms/CmsImage/SpecialCmsImageClient'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 
 /**
  * note that passing custom error type to next error boundary is not supported
@@ -13,7 +14,13 @@ export default function ErrorBoundary({ error, reset }: {error: unknown, reset:
         <div className={styles.wrapper}>
             <div className={styles.info}>
                 <div className={styles.imageContainer}>
-                    <SpecialCmsImageClient width={70} special="SERVER_ERROR" />
+                    <SpecialCmsImageClient
+                        width={70}
+                        special="SERVER_ERROR"
+                        //TODO: Probably call through other service see comments in frontpage operations
+                        readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                        updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                    />
                 </div>
                 {
                     error instanceof Error ? (
diff --git a/src/app/events/CreateOrUpdateEventForm.tsx b/src/app/events/CreateOrUpdateEventForm.tsx
index 58f6b22fd..0bbed89c3 100644
--- a/src/app/events/CreateOrUpdateEventForm.tsx
+++ b/src/app/events/CreateOrUpdateEventForm.tsx
@@ -12,10 +12,10 @@ import { createEventAction, updateEventAction } from '@/services/events/actions'
 import { eventCanBeViewdByOptions } from '@/services/events/constants'
 import { FIELD_IS_PRESENT_VALUE } from '@/lib/fields/constants'
 import { configureAction } from '@/services/configureAction'
+import { formatVevenUri } from '@/lib/urlEncoding'
 import { useState } from 'react'
 import type { Event, EventTag as EventTagT } from '@prisma/client'
 import type { ChangeEvent } from 'react'
-import { formatVevenUri } from '@/lib/urlEncoding'
 
 type PropTypes = {
     event?: Event & { tags: EventTagT[] }
diff --git a/src/app/events/[nameAndId]/page.tsx b/src/app/events/[nameAndId]/page.tsx
index bf9cb04e5..c47ab9619 100644
--- a/src/app/events/[nameAndId]/page.tsx
+++ b/src/app/events/[nameAndId]/page.tsx
@@ -13,12 +13,17 @@ import { SettingsHeaderItemPopUp, UsersHeaderItemPopUp } from '@/components/Head
 import { QueryParams } from '@/lib/queryParams/queryParams'
 import { unwrapActionReturn } from '@/app/redirectToErrorPage'
 import { readEventTagsAction } from '@/services/events/tags/actions'
-import { destroyEventAction, readEventAction } from '@/services/events/actions'
+import {
+    destroyEventAction,
+    readEventAction,
+    updateEventCmsCoverImageAction,
+    updateEventParagraphContentAction
+} from '@/services/events/actions'
 import { configureAction } from '@/services/configureAction'
+import { decodeVevenUriHandleError } from '@/lib/urlEncoding'
 import Link from 'next/link'
 import { faCalendar, faExclamation, faLocationDot, faUsers } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { decodeVevenUriHandleError } from '@/lib/urlEncoding'
 
 type PropTypes = {
     params: Promise<{
@@ -40,7 +45,15 @@ export default async function Event({ params }: PropTypes) {
     return (
         <div className={styles.wrapper}>
             <span className={styles.coverImage}>
-                <CmsImage cmsImage={event.coverImage} width={900} />
+                <CmsImage
+                    cmsImage={event.coverImage}
+                    width={900}
+                    updateCmsImageAction={
+                        configureAction(
+                            updateEventCmsCoverImageAction,
+                            { implementationParams: { eventId: event.id } }
+                        )}
+                />
                 <div className={styles.infoInImage}>
                     <ShowAndEditName event={event} />
                     <ul className={styles.tags}>
@@ -106,7 +119,15 @@ export default async function Event({ params }: PropTypes) {
 
             </aside>
             <main>
-                <CmsParagraph cmsParagraph={event.paragraph} />
+                <CmsParagraph
+                    cmsParagraph={event.paragraph}
+                    updateCmsParagraphAction={
+                        configureAction(
+                            updateEventParagraphContentAction,
+                            { implementationParams: { eventId: event.id } }
+                        )
+                    }
+                />
             </main>
 
             {event.takesRegistration && (
diff --git a/src/app/interest-groups/InterestGroup.tsx b/src/app/interest-groups/InterestGroup.tsx
index e58e29e66..f418b36e1 100644
--- a/src/app/interest-groups/InterestGroup.tsx
+++ b/src/app/interest-groups/InterestGroup.tsx
@@ -3,8 +3,18 @@ import Form from '@/components/Form/Form'
 import TextInput from '@/components/UI/TextInput'
 import ArticleSection from '@/components/Cms/ArticleSection/ArticleSection'
 import { SettingsHeaderItemPopUp } from '@/components/HeaderItems/HeaderItemPopUp'
-import { updateInterestGroupAction, destroyInterestGroupAction } from '@/services/groups/interestGroups/actions'
+import {
+    updateInterestGroupAction,
+    destroyInterestGroupAction,
+    updateInterestGroupArticleSectionAction,
+    addPartToInterestGroupArticleSectionAction,
+    removePartFromInterestGroupArticleSectionAction,
+    updateInterestGroupCmsImageAction,
+    updateInterestGroupCmsParagraphAction,
+    updateInterestGroupCmsLinkAction
+} from '@/services/groups/interestGroups/actions'
 import { interestGroupAuth } from '@/services/groups/interestGroups/auth'
+import { configureAction } from '@/services/configureAction'
 import type { SessionMaybeUser } from '@/auth/session/Session'
 import type { ExpandedInterestGroup } from '@/services/groups/interestGroups/types'
 
@@ -19,6 +29,8 @@ export default function InterestGroup({ interestGroup, session }: PropTypes) {
 
     const PopUpKey = `Update interest group ${interestGroup.name}`
 
+    const cmsArticleActionConfig = { implementationParams: { interestGroupId: interestGroup.id } }
+
     return (
         <div className={styles.interestGroup}>
             <h2>{interestGroup.name}</h2>
@@ -73,7 +85,30 @@ export default function InterestGroup({ interestGroup, session }: PropTypes) {
                     ) : <></>
                 }
             </div>
-            <ArticleSection key={interestGroup.id} articleSection={interestGroup.articleSection} />
+            <ArticleSection
+                key={interestGroup.id}
+                articleSection={interestGroup.articleSection}
+                actions={{
+                    updateArticleSection: configureAction(
+                        updateInterestGroupArticleSectionAction, cmsArticleActionConfig
+                    ),
+                    addPartToArticleSection: configureAction(
+                        addPartToInterestGroupArticleSectionAction, cmsArticleActionConfig
+                    ),
+                    removePartFromArticleSection: configureAction(
+                        removePartFromInterestGroupArticleSectionAction, cmsArticleActionConfig
+                    ),
+                    updateCmsImage: configureAction(
+                        updateInterestGroupCmsImageAction, cmsArticleActionConfig
+                    ),
+                    updateCmsParagraph: configureAction(
+                        updateInterestGroupCmsParagraphAction, cmsArticleActionConfig
+                    ),
+                    updateCmsLink: configureAction(
+                        updateInterestGroupCmsLinkAction, cmsArticleActionConfig
+                    ),
+                }}
+            />
         </div>
     )
 }
diff --git a/src/app/interest-groups/page.tsx b/src/app/interest-groups/page.tsx
index 76726d238..5b9edbd89 100644
--- a/src/app/interest-groups/page.tsx
+++ b/src/app/interest-groups/page.tsx
@@ -5,12 +5,16 @@ import PageWrapper from '@/components/PageWrapper/PageWrapper'
 import { AddHeaderItemPopUp } from '@/components/HeaderItems/HeaderItemPopUp'
 import { Session } from '@/auth/session/Session'
 import { interestGroupAuth } from '@/services/groups/interestGroups/auth'
-import { readInterestGroupsAction } from '@/services/groups/interestGroups/actions'
+import {
+    readInterestGroupsAction,
+    readSpecialCmsParagraphGeneralInfoAction,
+    updateSpecialCmsParagraphContentGeneralInfoAction
+} from '@/services/groups/interestGroups/actions'
 
 export default async function InterestGroups() {
     const session = await Session.fromNextAuth()
     const interestGroupsRes = await readInterestGroupsAction()
-    if (!interestGroupsRes.success) return <div>Failed to load interest groups</div> //TODO: Change to unwrap
+    if (!interestGroupsRes.success) return <div>Failed to load interest groups</div> //TODO: Change to unwrap?
     const interestGroups = interestGroupsRes.data
 
     const canCreate = interestGroupAuth.create.dynamicFields({}).auth(session)
@@ -23,7 +27,11 @@ export default async function InterestGroups() {
                 </AddHeaderItemPopUp>
             )
         }>
-            <SpecialCmsParagraph special="INTEREST_GROUP_GENERAL_INFO" />
+            <SpecialCmsParagraph
+                special="INTEREST_GROUP_GENERAL_INFO"
+                readSpecialCmsParagraphAction={readSpecialCmsParagraphGeneralInfoAction}
+                updateCmsParagraphAction={updateSpecialCmsParagraphContentGeneralInfoAction}
+            />
             <main>
                 {
                     interestGroups.map(interestGroup => (
diff --git a/src/app/news/CurrentNews.tsx b/src/app/news/CurrentNews.tsx
index cba9ac01c..d82f2cb84 100644
--- a/src/app/news/CurrentNews.tsx
+++ b/src/app/news/CurrentNews.tsx
@@ -8,6 +8,7 @@ type PropTypes = {
 
 /**
  * @param not - pass it not: a id of a news to exclude from the list
+ * WARNING: This component must be server-side rendered
  */
 export default async function CurrentNews({ not }: PropTypes) {
     const res = await readNewsCurrentAction()
diff --git a/src/app/news/[nameAndId]/EditNews.tsx b/src/app/news/[nameAndId]/EditNews.tsx
index 1b387f300..2c96ffda5 100644
--- a/src/app/news/[nameAndId]/EditNews.tsx
+++ b/src/app/news/[nameAndId]/EditNews.tsx
@@ -6,10 +6,11 @@ import Textarea from '@/components/UI/Textarea'
 import DateInput from '@/components/UI/DateInput'
 import useEditing from '@/hooks/useEditing'
 import { destroyNewsAction, updateNewsAction } from '@/services/news/actions'
+import { formatVevenUri } from '@/lib/urlEncoding'
+import { configureAction } from '@/services/configureAction'
 import { useRouter } from 'next/navigation'
 import type { ExpandedNewsArticle } from '@/services/news/types'
 import type { ReactNode } from 'react'
-import { formatVevenUri } from '@/lib/urlEncoding'
 
 type PropTypes = {
     news: ExpandedNewsArticle
@@ -28,7 +29,10 @@ export default function EditNews({ news, children }: PropTypes) {
 
     // TODO: VISINILITY ADMIN
 
-    const updateAction = updateNewsAction.bind(null, news.id)
+    const updateAction = configureAction(
+        updateNewsAction,
+        { params: { id: news.id } }
+    )
 
     return (
         <div className={styles.EditNews}>
@@ -53,7 +57,12 @@ export default function EditNews({ news, children }: PropTypes) {
                     <Textarea defaultValue={news.description || ''} label="beskrivelse" name="description" />
                 </Form>
                 <Form
-                    action={destroyNewsAction.bind(null, news.id)}
+                    action={
+                        configureAction(
+                            destroyNewsAction,
+                            { params: { id: news.id } }
+                        )
+                    }
                     successCallback={() => {
                         push('/news')
                         refresh()
diff --git a/src/app/news/[nameAndId]/page.tsx b/src/app/news/[nameAndId]/page.tsx
index 611148146..d7f17210d 100644
--- a/src/app/news/[nameAndId]/page.tsx
+++ b/src/app/news/[nameAndId]/page.tsx
@@ -2,9 +2,22 @@ import styles from './page.module.scss'
 import EditNews from './EditNews'
 import CurrentNews from '@/app/news/CurrentNews'
 import Article from '@/cms/Article/Article'
-import { readNewsAction } from '@/services/news/actions'
+import {
+    readNewsAction,
+    updateNewsArticleAction,
+    updateNewsArticleAddSectionAction,
+    updateNewsArticleCmsImageAction,
+    updateNewsArticleCmsLinkAction,
+    updateNewsArticleCmsParagraphAction,
+    updateNewsArticleCoverImageAction,
+    updateNewsArticleReorderSectionsAction,
+    updateNewsArticleSectionAction,
+    updateNewsArticleSectionsAddPartAction,
+    updateNewsArticleSectionsRemovePartAction
+} from '@/services/news/actions'
 import SlideInOnView from '@/components/SlideInOnView/SlideInOnView'
 import { decodeVevenUriHandleError } from '@/lib/urlEncoding'
+import { configureAction } from '@/services/configureAction'
 import { notFound } from 'next/navigation'
 
 type PropTypes = {
@@ -15,14 +28,60 @@ type PropTypes = {
 
 export default async function NewsArticle({ params }: PropTypes) {
     const idAndName = (await params).nameAndId
-    const res = await readNewsAction(decodeVevenUriHandleError(idAndName))
+    const res = await readNewsAction({ params: { id: decodeVevenUriHandleError(idAndName) } })
 
     if (!res.success) notFound()
     const news = res.data
 
     return (
         <div className={styles.wrapper}>
-            <Article article={news.article} />
+            <Article
+                article={news.article}
+                actions={{
+                    updateArticleAction: configureAction(
+                        updateNewsArticleAction,
+                        { implementationParams: { newsId: news.id } }
+                    ),
+                    updateCoverImageAction: configureAction(
+                        updateNewsArticleCoverImageAction,
+                        { implementationParams: { newsId: news.id } }
+                    ),
+                    addSectionToArticleAction: configureAction(
+                        updateNewsArticleAddSectionAction,
+                        { implementationParams: { newsId: news.id } }
+                    ),
+                    reorderArticleSectionsAction: configureAction(
+                        updateNewsArticleReorderSectionsAction,
+                        { implementationParams: { newsId: news.id } }
+                    ),
+                    articleSections: {
+                        updateCmsParagraph: configureAction(
+                            updateNewsArticleCmsParagraphAction,
+                            { implementationParams: { newsId: news.id } }
+                        ),
+                        updateCmsImage: configureAction(
+                            updateNewsArticleCmsImageAction,
+                            { implementationParams: { newsId: news.id } }
+                        ),
+                        updateCmsLink: configureAction(
+                            updateNewsArticleCmsLinkAction,
+                            { implementationParams: { newsId: news.id } }
+                        ),
+                        updateArticleSection: configureAction(
+                            updateNewsArticleSectionAction,
+                            { implementationParams: { newsId: news.id } }
+                        ),
+                        addPartToArticleSection: configureAction(
+                            updateNewsArticleSectionsAddPartAction,
+                            { implementationParams: { newsId: news.id } }
+                        ),
+                        removePartFromArticleSection: configureAction(
+                            updateNewsArticleSectionsRemovePartAction,
+                            { implementationParams: { newsId: news.id } }
+                        )
+                    }
+                }}
+            />
             <SlideInOnView>
                 <EditNews news={news}>
                     <div className={styles.moreNews}>
diff --git a/src/app/news/archive/page.tsx b/src/app/news/archive/page.tsx
index 77ebad4e1..3c76917a0 100644
--- a/src/app/news/archive/page.tsx
+++ b/src/app/news/archive/page.tsx
@@ -7,13 +7,17 @@ import type { PageSizeOldNews } from '@/contexts/paging/OldNewsPaging'
 
 export default async function NewsArchive() {
     const pageSize: PageSizeOldNews = 20
-    const res = await readOldNewsPageAction<PageSizeOldNews>({
-        page: {
-            page: 0,
-            pageSize,
-            cursor: null,
-        },
-        details: undefined
+    const res = await readOldNewsPageAction({
+        params: {
+            paging: {
+                page: {
+                    page: 0,
+                    pageSize,
+                    cursor: null,
+                },
+                details: undefined
+            },
+        }
     })
     if (!res.success) throw new Error('Failed to read news')
     const serverRendered = res.data
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index 80ec01e20..66da9c200 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -1,4 +1,5 @@
 import styles from './not-found.module.scss'
+import { readSpecialCmsImageFrontpage, updateSpecialCmsImageFrontpage } from '@/services/frontpage/actions'
 import SpecialCmsImage from '@/components/Cms/CmsImage/SpecialCmsImage'
 
 export default function Error404() {
@@ -6,7 +7,13 @@ export default function Error404() {
         <div className={styles.wrapper}>
             <div className={styles.info}>
                 <div className={styles.imageContainer}>
-                    <SpecialCmsImage special="NOT_FOUND" width={60} />
+                    <SpecialCmsImage
+                        special="NOT_FOUND"
+                        width={60}
+                        //TODO: Probably call through other service see comments in frontpage operations
+                        readSpecialCmsImageAction={readSpecialCmsImageFrontpage}
+                        updateCmsImageAction={updateSpecialCmsImageFrontpage}
+                    />
                 </div>
                 <h3>404 - Page not found</h3>
             </div>
diff --git a/src/app/ombul/[...yearAndName]/page.tsx b/src/app/ombul/[...yearAndName]/page.tsx
index cce4be720..4b1fad257 100644
--- a/src/app/ombul/[...yearAndName]/page.tsx
+++ b/src/app/ombul/[...yearAndName]/page.tsx
@@ -1,12 +1,13 @@
 import styles from './page.module.scss'
 import ChangeName from './ChangeName'
 import OmbulAdmin from './OmbulAdmin'
-import { readOmbulAction, updateOmbulAction } from '@/services/ombul/actions'
+import { readOmbulAction, updateOmbulAction, updateOmbulCmsCoverImageAction } from '@/services/ombul/actions'
 import PdfDocument from '@/components/PdfDocument/PdfDocument'
 import SlideInOnView from '@/components/SlideInOnView/SlideInOnView'
 import EditableTextField from '@/components/EditableTextField/EditableTextField'
 import { getUser } from '@/auth/session/getUser'
 import CmsImage from '@/components/Cms/CmsImage/CmsImage'
+import { configureAction } from '@/services/configureAction'
 import Link from 'next/link'
 import { notFound } from 'next/navigation'
 
@@ -26,15 +27,17 @@ export default async function Ombul({ params }: PropTypes) {
     const name = decodeURIComponent((await params).yearAndName[1])
     if (!year || !name || (await params).yearAndName.length > 2) notFound()
     const ombulRes = await readOmbulAction({
-        name,
-        year
+        params: {
+            name,
+            year
+        }
     })
     if (!ombulRes.success) notFound()
     const ombul = ombulRes.data
 
     const path = `/store/ombul/${ombul.fsLocation}`
 
-    const canUpdate = permissions.includes('OMBUL_UPDATE')
+    const canUpdate = permissions.includes('OMBUL_UPDATE') //TODO: use update auther.
 
     const changeDescription = updateOmbulAction.bind(null, ombul.id)
 
@@ -75,7 +78,16 @@ export default async function Ombul({ params }: PropTypes) {
             </div>
             <div className={styles.admin}>
                 <OmbulAdmin ombul={ombul}>
-                    <CmsImage cmsImage={ombul.coverImage} width={400}/>
+                    <CmsImage
+                        cmsImage={ombul.coverImage}
+                        width={400}
+                        updateCmsImageAction={
+                            configureAction(
+                                updateOmbulCmsCoverImageAction,
+                                { implementationParams: { ombulId: ombul.id } }
+                            )
+                        }
+                    />
                 </OmbulAdmin>
             </div>
         </div>
diff --git a/src/app/report/page.tsx b/src/app/report/page.tsx
index c99b7b9f2..df185aead 100644
--- a/src/app/report/page.tsx
+++ b/src/app/report/page.tsx
@@ -1,16 +1,16 @@
 import styles from './page.module.scss'
-import Article from '@/components/Cms/Article/Article'
-import { readSpecialArticle } from '@/cms/articles/actions'
 import { unwrapActionReturn } from '@/app/redirectToErrorPage'
+import { readPublicArticle } from '@/services/publicArticles/actions'
+import PublicArticle from '@/components/Cms/PublicArticle/PublicArticle'
 
 
 export default async function report() {
-    const reportArticleRes = await readSpecialArticle({ params: { specialCmsArticle: 'REPORT_PAGE' } })
+    const reportArticleRes = await readPublicArticle({ params: { special: 'REPORT_PAGE' } })
     const unwrappedArticle = unwrapActionReturn(reportArticleRes)
 
     return (
         <div className={styles.wrapper}>
-            <Article article={unwrappedArticle} />
+            <PublicArticle article={unwrappedArticle} />
         </div>
     )
 }
diff --git a/src/auth/auther/RequireOneOfPermission.ts b/src/auth/auther/RequireOneOfPermission.ts
new file mode 100644
index 000000000..1b179657c
--- /dev/null
+++ b/src/auth/auther/RequireOneOfPermission.ts
@@ -0,0 +1,12 @@
+import { AutherFactory } from './Auther'
+import type { Permission } from '@prisma/client'
+
+export const RequireOneOfPermission = AutherFactory<
+    { permissions: Permission[] },
+    Record<string, never>,
+    'USER_NOT_REQUIERED_FOR_AUTHORIZED'
+>(({ session, staticFields }) => ({
+    success: staticFields.permissions.some(permission => session.permissions.includes(permission)),
+    errorMessage: 'Du har ikke en av de nødvendige tillatelsene',
+    session,
+}))
diff --git a/src/auth/auther/RequirePermission.ts b/src/auth/auther/RequirePermission.ts
index 24f49e8b4..8a12fbe43 100644
--- a/src/auth/auther/RequirePermission.ts
+++ b/src/auth/auther/RequirePermission.ts
@@ -8,4 +8,5 @@ export const RequirePermission = AutherFactory<
 >(({ session, staticFields }) => ({
     success: session.permissions.includes(staticFields.permission),
     session,
+    errorMessage: `Du trenger tillatelse '${staticFields.permission}' for å få tilgang`
 }))
diff --git a/src/auth/auther/RequirePermissionAndDynamicPermission.ts b/src/auth/auther/RequirePermissionAndDynamicPermission.ts
index 96159a1c9..5c013d289 100644
--- a/src/auth/auther/RequirePermissionAndDynamicPermission.ts
+++ b/src/auth/auther/RequirePermissionAndDynamicPermission.ts
@@ -15,7 +15,8 @@ export const RequirePermissionAndDynamicPermission = AutherFactory<
     if (!session.permissions.includes(staticFields.permission)) {
         return {
             success: false,
-            session
+            session,
+            errorMessage: `Du trenger tillatelse '${staticFields.permission}' for å få tilgang`
         }
     }
 
diff --git a/src/auth/auther/RequirePermissionAndUser.ts b/src/auth/auther/RequirePermissionAndUser.ts
index 9197dc527..d406811f4 100644
--- a/src/auth/auther/RequirePermissionAndUser.ts
+++ b/src/auth/auther/RequirePermissionAndUser.ts
@@ -9,11 +9,13 @@ export const RequirePermissionAndUser = AutherFactory<
     if (!session.user) {
         return {
             success: false,
-            session
+            session,
+            errorMessage: 'Du må være innlogget for å få tilgang'
         }
     }
     return {
         success: session.permissions.includes(staticFields.permission),
-        session
+        session,
+        errorMessage: `Du trenger tillatelse '${staticFields.permission}' for å få tilgang`
     }
 })
diff --git a/src/auth/auther/RequirePermissionAndUserId.ts b/src/auth/auther/RequirePermissionAndUserId.ts
index 6ba045130..8c10a7f9a 100644
--- a/src/auth/auther/RequirePermissionAndUserId.ts
+++ b/src/auth/auther/RequirePermissionAndUserId.ts
@@ -9,17 +9,20 @@ export const RequirePermissionAndUserId = AutherFactory<
     if (!session.user) {
         return {
             success: false,
-            session
+            session,
+            errorMessage: 'Du må være innlogget for å få tilgang'
         }
     }
     if (session.user.id !== dynamicFields.userId) {
         return {
             success: false,
-            session
+            session,
+            errorMessage: 'Du er ikke autorisert til å se denne ressursen'
         }
     }
     return {
         success: session.permissions.includes(staticFields.permission),
-        session
+        session,
+        errorMessage: `Du trenger tillatelse '${staticFields.permission}' for å få tilgang`
     }
 })
diff --git a/src/auth/auther/RequirePermissionOrGroupAdmin.ts b/src/auth/auther/RequirePermissionOrGroupAdmin.ts
index 98eb052a0..dbeef8ca8 100644
--- a/src/auth/auther/RequirePermissionOrGroupAdmin.ts
+++ b/src/auth/auther/RequirePermissionOrGroupAdmin.ts
@@ -10,4 +10,8 @@ export const RequirePermissionOrGroupAdmin = AutherFactory<
         membersip => membersip.groupId === dynamicFields.groupId && membersip.admin && membersip.active
     ),
     session,
+    errorMessage: `
+        Du trenger tillatelse '${staticFields.permission}' for å få tilgang eller 
+        være gruppeleder for gruppe ${dynamicFields.groupId}
+    `
 }))
diff --git a/src/auth/auther/RequireUser.ts b/src/auth/auther/RequireUser.ts
index be4ed8a60..b1049743e 100644
--- a/src/auth/auther/RequireUser.ts
+++ b/src/auth/auther/RequireUser.ts
@@ -4,4 +4,7 @@ export const RequireUser = AutherFactory<
     Record<string, never>,
     Record<string, never>,
     'USER_REQUIERED_FOR_AUTHORIZED'
->(({ session }) => (session.user ? { success: true, session } : { success: false, session }))
+>(({ session }) => (session.user ?
+    { success: true, session } :
+    { success: false, session, errorMessage: 'Du må være innlogget for å få tilgang' }
+))
diff --git a/src/auth/auther/RequireUserFieldOrPermission.ts b/src/auth/auther/RequireUserFieldOrPermission.ts
index de55b3807..aaeadb7b8 100644
--- a/src/auth/auther/RequireUserFieldOrPermission.ts
+++ b/src/auth/auther/RequireUserFieldOrPermission.ts
@@ -39,6 +39,9 @@ export const RequireUserFieldOrPermission = AutherFactory<
     }
     return {
         success: false,
-        session
+        session,
+        errorMessage: `
+            Du har ikke tilgang til denne ressursen
+        `
     }
 })
diff --git a/src/auth/auther/RequireUserId.ts b/src/auth/auther/RequireUserId.ts
index d5c791c9f..ae541b665 100644
--- a/src/auth/auther/RequireUserId.ts
+++ b/src/auth/auther/RequireUserId.ts
@@ -8,11 +8,13 @@ export const RequireUserId = AutherFactory<
     if (!session.user) {
         return {
             success: false,
-            session
+            session,
+            errorMessage: 'Du må være innlogget for å få tilgang'
         }
     }
     return {
         success: session.user.id === dynamicFields.userId,
-        session
+        session,
+        errorMessage: 'Du har ikke tilgang til denne ressursen'
     }
 })
diff --git a/src/auth/auther/RequireUserIdOrPermission.ts b/src/auth/auther/RequireUserIdOrPermission.ts
index ed5053258..f0987d6dc 100644
--- a/src/auth/auther/RequireUserIdOrPermission.ts
+++ b/src/auth/auther/RequireUserIdOrPermission.ts
@@ -14,6 +14,7 @@ export const RequireUserIdOrPermission = AutherFactory<
     }
     return {
         success: session.user !== null && session.user.id === dynamicFields.userId,
-        session
+        session,
+        errorMessage: 'Du har ikke tilgang til denne ressursen'
     }
 })
diff --git a/src/auth/auther/RequireUsername.ts b/src/auth/auther/RequireUsername.ts
index 7a4d934bb..1cd989881 100644
--- a/src/auth/auther/RequireUsername.ts
+++ b/src/auth/auther/RequireUsername.ts
@@ -9,10 +9,12 @@ export const RequireUsername = AutherFactory<
         return {
             success: false,
             session,
+            errorMessage: 'Du må være innlogget for å få tilgang'
         }
     }
     return {
         success: session.user?.username === dynamicFields.username,
         session,
+        errorMessage: 'Du har ikke tilgang til denne ressursen'
     }
 })
diff --git a/src/auth/auther/RequireUsernameOrPermission.ts b/src/auth/auther/RequireUsernameOrPermission.ts
index d7ba6164c..f47083542 100644
--- a/src/auth/auther/RequireUsernameOrPermission.ts
+++ b/src/auth/auther/RequireUsernameOrPermission.ts
@@ -14,6 +14,7 @@ export const RequireUsernameOrPermission = AutherFactory<
     }
     return {
         success: session.user !== null && session.user.username === dynamicFields.username,
-        session
+        session,
+        errorMessage: 'Du har ikke tilgang til denne ressursen'
     }
 })
diff --git a/src/contexts/paging/OldNewsPaging.tsx b/src/contexts/paging/OldNewsPaging.tsx
index 07d04fa8f..b99a5460f 100644
--- a/src/contexts/paging/OldNewsPaging.tsx
+++ b/src/contexts/paging/OldNewsPaging.tsx
@@ -10,6 +10,8 @@ export const [OldNewsPagingContext, OldNewsPagingProvider] = generatePaging<
     NewsCursor,
     PageSizeOldNews
 >({
-    fetcher: async ({ paging }) => await readOldNewsPageAction(paging),
+    fetcher: async ({ paging }) => await readOldNewsPageAction({
+        params: { paging }
+    }),
     getCursor: ({ lastElement }) => ({ id: lastElement.id }),
 })
diff --git a/src/prisma/schema/cms.prisma b/src/prisma/schema/cms.prisma
index 376c0f38a..3e0024b69 100644
--- a/src/prisma/schema/cms.prisma
+++ b/src/prisma/schema/cms.prisma
@@ -100,10 +100,12 @@ model ArticleSection {
   imageSize     Int      @default(200)
   article       Article? @relation(fields: [articleId], references: [id], onDelete: Cascade)
   articleId     Int?
-  order         Int      @default(autoincrement()) //The order "position" of the article section in the article
 
-  //If true, the article section will be deleted if it is empty, ie has no relation to paragraph, link or image
-  destroyOnEmpty Boolean        @default(true)
+  //The order "position" of the article section in the article
+  //This field is only used when articleSection is part of an article
+  order         Int      @default(autoincrement()) 
+
+
   cmsImage       CmsImage?
   cmsParagraph   CmsParagraph?
   cmsLink        CmsLink?
@@ -127,21 +129,20 @@ model Article {
   articleCategory     ArticleCategory? @relation(fields: [articleCategoryId, articleCategoryName], references: [id, name], onDelete: Cascade)
   articleCategoryId   Int?
   articleCategoryName String?
-  coverImage          CmsImage         @relation(fields: [coverImageId], references: [id], onDelete: Cascade)
+  coverImage          CmsImage         @relation(fields: [coverImageId], references: [id], onDelete: Restrict)
   coverImageId        Int              @unique
   JobAd               JobAd?
   Committee           Committee?
   special SpecialCmsArticle? @unique
 
   @@unique([name, id])
-  @@unique([articleCategoryName, name])
 }
 
 model NewsArticle {
   id             Int        @id @default(autoincrement())
   description    String?
   endDateTime    DateTime //when the article is no longer considered current
-  article        Article    @relation(fields: [articleId, articleName], references: [id, name], onDelete: Cascade) //This should always be set, but it is not required by schema (prisma limitation)
+  article        Article    @relation(fields: [articleId, articleName], references: [id, name], onDelete: Restrict)
   articleId      Int        @unique
   articleName    String
 
diff --git a/src/prisma/schema/permission.prisma b/src/prisma/schema/permission.prisma
index 08e75ba90..918d9021a 100644
--- a/src/prisma/schema/permission.prisma
+++ b/src/prisma/schema/permission.prisma
@@ -60,8 +60,8 @@ enum Permission {
   LOCKER_ADMIN
   LOCKER_USE
 
-  // CMS permissions - it overrides the visibility of things
-  CMS_ADMIN
+  // Frontpage
+  FRONTPAGE_ADMIN
 
   // User list permissions - theese are admin permissions, and do not have anything
   // to do with a user´s ability to edit its own user.
@@ -177,6 +177,9 @@ enum Permission {
   // Applications
   APPLICATION_ADMIN
   APPLICATION_WRITE
+
+  // Public articles
+  PUBLIC_ARTICLE_ADMIN
 }
 
 model GroupPermission {
diff --git a/src/prisma/schema/school.prisma b/src/prisma/schema/school.prisma
index bd7450260..e72edec71 100644
--- a/src/prisma/schema/school.prisma
+++ b/src/prisma/schema/school.prisma
@@ -5,7 +5,7 @@ enum StandardSchool {
 model School {
   id             Int             @id @default(autoincrement())
   name           String          @unique
-  shortname      String          @unique
+  shortName      String          @unique
   standardSchool StandardSchool? @unique
   desctiption    String          @default("")
   cmsParagraph   CmsParagraph    @relation(fields: [cmsParagraphId], references: [id])
diff --git a/src/prisma/seeder/src/development/seedDevSchools.ts b/src/prisma/seeder/src/development/seedDevSchools.ts
index 80e602eb5..ef14e8578 100644
--- a/src/prisma/seeder/src/development/seedDevSchools.ts
+++ b/src/prisma/seeder/src/development/seedDevSchools.ts
@@ -5,7 +5,7 @@ export default async function seedDevSchools(prisma: PrismaClient) {
         await prisma.school.create({
             data: {
                 name: `Skole ${i}`,
-                shortname: `sk${i}`,
+                shortName: `sk${i}`,
                 cmsImage: {
                     create: {
                         name: `Skole ${i} bilde`
diff --git a/src/prisma/seeder/src/dobbelOmega/migrateCommittees.ts b/src/prisma/seeder/src/dobbelOmega/migrateCommittees.ts
index 01ba4bf81..0ba09d88b 100644
--- a/src/prisma/seeder/src/dobbelOmega/migrateCommittees.ts
+++ b/src/prisma/seeder/src/dobbelOmega/migrateCommittees.ts
@@ -59,13 +59,13 @@ export default async function migrateCommittees(
     // })).order
 
     await Promise.all(committees.map(async committee => {
-        const committeeParagraph = await readCommitteParagraph(`${committee.shortname}_p.md`)
-        const committeArticle = await readCommitteArticle(`${committee.shortname}_a.md`)
+        const committeeParagraph = await readCommitteParagraph(`${committee.shortName}_p.md`)
+        const committeArticle = await readCommitteArticle(`${committee.shortName}_a.md`)
 
         const newCommittee = await pnPrisma.committee.create({
             data: {
                 name: committee.name,
-                shortName: committee.shortname,
+                shortName: committee.shortName,
                 videoLink: committee.applicationVideo,
                 logoImage: {
                     create: {
@@ -85,7 +85,7 @@ export default async function migrateCommittees(
                         name: committee.name,
                         coverImage: {
                             create: {
-                                name: `${committee.shortname}'s bilde`
+                                name: `${committee.shortName}'s bilde`
                             }
                         },
                         articleSections: committeArticle
@@ -102,7 +102,7 @@ export default async function migrateCommittees(
 
         await Promise.all(committee.CommitteeMembers.map(async member => {
             if (member.UserId === null) {
-                console.warn(`${committee.shortname} has a member that is not connected to a user!`)
+                console.warn(`${committee.shortName} has a member that is not connected to a user!`)
                 console.warn(member)
                 return
             }
diff --git a/src/prisma/seeder/src/seedSpecialVisibility.ts b/src/prisma/seeder/src/seedSpecialVisibility.ts
index f6c8b2102..486f1ed34 100644
--- a/src/prisma/seeder/src/seedSpecialVisibility.ts
+++ b/src/prisma/seeder/src/seedSpecialVisibility.ts
@@ -7,7 +7,8 @@ const SpecialVisibilityConfig = {
     },
     PUBLIC: {
         regularLevel: null,
-        adminLevel: 'CMS_ADMIN'
+        adminLevel: 'FRONTPAGE_ADMIN' // just changed this to make ts happy
+        // bypass and purposes will be removed
     },
     COMMITTEE: {
         regularLevel: 'COMMITTEE_READ',
diff --git a/src/prisma/vevenSchema/schema.veven.prisma b/src/prisma/vevenSchema/schema.veven.prisma
index ef13b794d..78fb22d53 100644
--- a/src/prisma/vevenSchema/schema.veven.prisma
+++ b/src/prisma/vevenSchema/schema.veven.prisma
@@ -109,7 +109,7 @@ model CommitteeMembersHist {
 model Committees {
   id                    Int                     @id @default(autoincrement())
   name                  String                  @db.VarChar(255)
-  shortname             String                  @unique @db.VarChar(255)
+  shortName             String                  @unique @db.VarChar(255)
   applicationLead       String?
   applicationVideo      String?                 @db.VarChar(255)
   applicationText       String?
diff --git a/src/services/actionTypes.ts b/src/services/actionTypes.ts
index 9c93900a7..d15c96dc4 100644
--- a/src/services/actionTypes.ts
+++ b/src/services/actionTypes.ts
@@ -1,4 +1,6 @@
+import type { SubServiceOperation, ServiceOperation } from '@/services/serviceOperation'
 import type { ErrorMessage, ErrorCode } from '@/services/error'
+import type { z } from 'zod'
 
 /**
  * The return type of an action on error.
@@ -23,6 +25,119 @@ export type ActionData<T = undefined> = {
  */
 export type ActionReturn<T = undefined> = ActionData<T> | ActionError
 
-export type Action<T = undefined> = (formData: FormData) => (
-    Promise<ActionReturn<T>>
+/**
+ * Type for an action with implementation params and params finished bound (configured). This type
+ * also only accesses the form data not ```{ data: z.input<DataSchema> }```
+ */
+export type ActionFormData<T = undefined> = (formData: FormData) => Promise<ActionReturn<T>>
+
+export type Action<
+    Return,
+    ImplementationParamsSchema extends z.ZodTypeAny | undefined,
+    ParamsSchema extends z.ZodTypeAny | undefined,
+    DataSchema extends z.ZodTypeAny | undefined,
+> = (
+    ImplementationParamsSchema extends z.ZodTypeAny ? (
+        ParamsSchema extends z.ZodTypeAny ? (
+            DataSchema extends z.ZodTypeAny ? (
+                (
+                    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
+                    params: { params: z.input<ParamsSchema> },
+                    data: { data: z.input<DataSchema> } | FormData
+                ) => Promise<ActionReturn<Return>>
+            ) : (
+                (
+                    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
+                    params: { params: z.input<ParamsSchema> },
+                ) => Promise<ActionReturn<Return>>
+            )
+        ) : (
+        DataSchema extends z.ZodTypeAny ? (
+                (
+                    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
+                    params: { params: undefined },
+                    data: { data: z.input<DataSchema> } | FormData
+                ) => Promise<ActionReturn<Return>>
+            ) : (
+                (
+                    implementationParamsSchema: {
+                        implementationParamsSchema: z.input<ImplementationParamsSchema>
+                    },
+                ) => Promise<ActionReturn<Return>>
+            )
+        )
+    ) : (
+        ParamsSchema extends z.ZodTypeAny ? (
+            DataSchema extends z.ZodTypeAny ? (
+                (
+                    params: { params: z.input<ParamsSchema> },
+                    data: { data: z.input<DataSchema> } | FormData
+                ) => Promise<ActionReturn<Return>>
+            ) : (
+                (
+                    params: { params: z.input<ParamsSchema> },
+                ) => Promise<ActionReturn<Return>>
+            )
+        ) : (
+            DataSchema extends z.ZodTypeAny ? (
+                (
+                    data: { data: z.input<DataSchema> } | FormData
+                ) => Promise<ActionReturn<Return>>
+            ) : (
+                () => Promise<ActionReturn<Return>>
+            )
+        )
+    )
 )
+
+
+/**
+ * Utility type to extract the action function type from a service operation.
+ *
+ * Takes a finished implemented service operation and returns the type of the
+ * function that makeAction would return for it.
+ *
+ * @example
+ * ```typescript
+ * const myOperation = defineOperation({...}).implement({...})
+ * type MyActionType = ActionFromServiceOperation<typeof myOperation>
+ * // MyActionType is now the function type with correct parameters and ActionReturn
+ * ```
+ */
+export type ActionFromServiceOperation<T> =
+    T extends ServiceOperation<
+        boolean,
+        infer Return,
+        infer ParamsSchema,
+        infer DataSchema,
+        infer ImplementationParamsSchema
+    > ? Action<Return, ImplementationParamsSchema, ParamsSchema, DataSchema> : 'FAILED_SERVICE_MATCH'
+
+/**
+ * This type extracts the action function type from a sub-service operation.
+ * It will not include the implementation params as first argument as it is not known from a sub-service operation.
+ * It is assumed to be undefined
+ */
+export type ActionFromSubServiceOperation<
+    T,
+> = T extends SubServiceOperation<
+    infer Return,
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    infer OpensTransaction,
+    infer ParamsSchema,
+    infer DataSchema,
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    infer ParamsSchemaImplementationFields,
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    infer DataSchemaImplementationFields,
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+    infer OperationImplementationFields
+> ? Action<Return, undefined, ParamsSchema, DataSchema> : 'FAILED_SUBSERVICE_MATCH'
+
+export type ConfiguredAction<
+    ActionFcn
+> = ActionFcn extends (
+        p: infer P extends { params: infer Params } | { implementationParams: infer ImplementationParams },
+        ...rest: infer D) => infer R ? (
+    (...rest: D) => R
+) : 'FAILED_ACTION_MATCH'
diff --git a/src/services/applications/periods/types.ts b/src/services/applications/periods/types.ts
index 36ba710da..83c718c17 100644
--- a/src/services/applications/periods/types.ts
+++ b/src/services/applications/periods/types.ts
@@ -4,7 +4,7 @@ import type { Image, Prisma } from '@prisma/client'
 export type CountdownInfo = {
     endTime: Date,
     commiteesParticipating: {
-        shortname: string,
+        shortName: string,
         logo: Image
     }[]
 }
diff --git a/src/services/articleCategories/actions.ts b/src/services/articleCategories/actions.ts
new file mode 100644
index 000000000..f2119aa28
--- /dev/null
+++ b/src/services/articleCategories/actions.ts
@@ -0,0 +1,56 @@
+'use server'
+import { articleCategoryOperations } from './operations'
+import { makeAction } from '@/services/serverAction'
+import type { ExpandedArticleCategory } from './types'
+import type { ActionReturn } from '@/services/actionTypes'
+
+export const createArticleCategoryAction = makeAction(articleCategoryOperations.create)
+export const destroyArticleCategoryAction = makeAction(articleCategoryOperations.destroy)
+export const readArticleCategoriesAction = makeAction(articleCategoryOperations.readAll)
+export const readArticleCategoryAction = makeAction(articleCategoryOperations.read)
+export const readArticleInCategoryAction = makeAction(articleCategoryOperations.readArticleInCategory)
+export const updateArticleCategoryAction = makeAction(articleCategoryOperations.update)
+export const addArticleToCategoryAction = makeAction(articleCategoryOperations.addArticleToCategory)
+export const removeArticleFromCategoryAction = makeAction(articleCategoryOperations.removeArticleFromCategory)
+
+export const updateArticleCategoryArticleAction = makeAction(
+    articleCategoryOperations.updateArticle.update
+)
+export const updateArticleCategoryArticleAddSectionAction = makeAction(
+    articleCategoryOperations.updateArticle.addSection
+)
+export const updateArticleCategoryArticleReorderSectionsAction = makeAction(
+    articleCategoryOperations.updateArticle.reorderSections
+)
+export const updateArticleCategoryArticleCoverImageAction = makeAction(
+    articleCategoryOperations.updateArticle.coverImage
+)
+export const updateArticleCategoryArticleSectionAction = makeAction(
+    articleCategoryOperations.updateArticle.articleSections.update
+)
+export const updateArticleCategoryArticleSectionsAddPartAction = makeAction(
+    articleCategoryOperations.updateArticle.articleSections.addPart
+)
+export const updateArticleCategoryArticleSectionsRemovePartAction = makeAction(
+    articleCategoryOperations.updateArticle.articleSections.removePart
+)
+export const updateArticleCategoryArticleCmsImageAction = makeAction(
+    articleCategoryOperations.updateArticle.articleSections.cmsImage
+)
+export const updateArticleCategoryArticleCmsParagraphAction = makeAction(
+    articleCategoryOperations.updateArticle.articleSections.cmsParagraph
+)
+export const updateArticleCategoryArticleCmsLinkAction = makeAction(
+    articleCategoryOperations.updateArticle.articleSections.cmsLink
+)
+
+//TODO: Implement vicibility system as part of articleCategoryOperations
+export async function updateArticleCategoryVisibilityAction(
+    // disable eslint rule temporarily until function is implemented
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    id: number,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    visibility: unknown
+): Promise<ActionReturn<ExpandedArticleCategory>> {
+    throw new Error('Not implemented')
+}
diff --git a/src/services/articleCategories/auth.ts b/src/services/articleCategories/auth.ts
new file mode 100644
index 000000000..6cb9d0f7d
--- /dev/null
+++ b/src/services/articleCategories/auth.ts
@@ -0,0 +1,16 @@
+import { RequireNothing } from '@/auth/auther/RequireNothing'
+
+export const articleCategoryAuth = {
+    //This should probably be a permoission:
+    create: RequireNothing.staticFields({}),
+    //Article categories will be auth on visibility spesific to each category.
+    destroy: RequireNothing.staticFields({}),
+    update: RequireNothing.staticFields({}),
+    updateArticle: RequireNothing.staticFields({}),
+    readAll: RequireNothing.staticFields({}), //auth filter!!
+    read: RequireNothing.staticFields({}),
+    removeArticleFromCategory: RequireNothing.staticFields({}),
+    addArticleToCategory: RequireNothing.staticFields({}),
+    // visibility another vicibility table ....
+    readArticleInCategory: RequireNothing.staticFields({}),
+}
diff --git a/src/services/articleCategories/operations.ts b/src/services/articleCategories/operations.ts
new file mode 100644
index 000000000..f5993012b
--- /dev/null
+++ b/src/services/articleCategories/operations.ts
@@ -0,0 +1,246 @@
+import '@pn-server-only'
+import { articleCategoryAuth } from './auth'
+import { articleCategorySchemas } from './schemas'
+import { defineOperation } from '@/services/serviceOperation'
+import { ServerError } from '@/services/error'
+import { implementUpdateArticleOperations } from '@/cms/articles/implement'
+import { articleOperations } from '@/cms/articles/operations'
+import { z } from 'zod'
+import type { ExpandedArticleCategory } from './types'
+import type { Image } from '@prisma/client'
+import type { PrismaPossibleTransaction } from '@/services/serviceOperation'
+
+export const articleCategoryOperations = {
+    create: defineOperation({
+        authorizer: () => articleCategoryAuth.create.dynamicFields({}),
+        dataSchema: articleCategorySchemas.create,
+        operation: ({ prisma, data }) =>
+            prisma.articleCategory.create({
+                data,
+                include: {
+                    articles: true
+                },
+            })
+    }),
+
+    destroy: defineOperation({
+        authorizer: () => articleCategoryAuth.destroy.dynamicFields({}),
+        paramsSchema: z.object({
+            id: z.number()
+        }),
+        operation: async ({ prisma, params }) => {
+            // There is onDelete cascade on articles when article category is deleted
+            // however coverImages of articles on articles are not cascade deleted when articles are
+            // Thus we call the destroy operation on all articles to fix this
+            const allArticles = await prisma.article.findMany({
+                where: {
+                    articleCategoryId: params.id
+                }
+            })
+            await Promise.all(allArticles.map(article =>
+                articleOperations.destroy({ params: { articleId: article.id }, bypassAuth: true })
+            ))
+
+            return await prisma.articleCategory.delete({
+                where: {
+                    id: params.id
+                },
+                include: {
+                    articles: true
+                }
+            })
+        }
+    }),
+
+    update: defineOperation({
+        authorizer: () => articleCategoryAuth.update.dynamicFields({}),
+        paramsSchema: z.object({
+            id: z.number(),
+        }),
+        dataSchema: articleCategorySchemas.update,
+        operation: ({ prisma, data, params }) =>
+            prisma.articleCategory.update({
+                where: {
+                    id: params.id
+                },
+                data,
+                include: {
+                    articles: true
+                }
+            })
+    }),
+
+    addArticleToCategory: defineOperation({
+        authorizer: () => articleCategoryAuth.addArticleToCategory.dynamicFields({}),
+        paramsSchema: z.object({
+            id: z.number()
+        }),
+        opensTransaction: true,
+        operation: ({ prisma, params }) => {
+            prisma.$transaction(async (tx) => {
+                const article = await articleOperations.create({ data: { }, prisma: tx, bypassAuth: true })
+                await tx.articleCategory.update({
+                    where: {
+                        id: params.id
+                    },
+                    data: {
+                        articles: {
+                            connect: {
+                                id: article.id
+                            }
+                        }
+                    }
+                })
+            })
+        }
+    }),
+
+    removeArticleFromCategory: defineOperation({
+        authorizer: () => articleCategoryAuth.removeArticleFromCategory.dynamicFields({}),
+        paramsSchema: z.object({
+            id: z.number(),
+            articleId: z.number()
+        }),
+        operation: async ({ prisma, params }) => {
+            //check ownership:
+            const article = await prisma.article.findUnique({
+                where: {
+                    id: params.articleId
+                }
+            })
+            if (!article) throw new ServerError('NOT FOUND', `Article ${params.articleId} not found`)
+            if (article.articleCategoryId !== params.id) {
+                throw new ServerError(
+                    'BAD PARAMETERS',
+                    `Article ${params.articleId} does not belong to category ${params.id}`
+                )
+            }
+
+            await articleOperations.destroy({ params: { articleId: params.articleId }, bypassAuth: true })
+        }
+    }),
+
+    updateArticle: implementUpdateArticleOperations({
+        authorizer: () => articleCategoryAuth.updateArticle.dynamicFields({}),
+        implementationParamsSchema: z.object({
+            articleCategoryId: z.number(),
+        }),
+        ownedArticles: ({ implementationParams, prisma }) => prisma.article.findMany({
+            where: {
+                articleCategoryId: implementationParams.articleCategoryId
+            },
+            include: {
+                coverImage: true,
+                articleSections: {
+                    include: {
+                        cmsImage: true,
+                        cmsLink: true,
+                        cmsParagraph: true
+                    }
+                }
+            }
+        })
+    }),
+
+    readAll: defineOperation({
+        authorizer: () => articleCategoryAuth.readAll.dynamicFields({}),
+        operation: async ({ prisma }) => {
+            const categories = await prisma.articleCategory.findMany({
+                include: {
+                    articles: {
+                        take: 1,
+                        include: {
+                            coverImage: true
+                        }
+                    },
+                },
+                orderBy: {
+                    createdAt: 'desc'
+                }
+            })
+            const categoriesWithCover = await Promise.all(categories.map(async category => (
+                {
+                    ...category,
+                    coverImage: (await getCoverImage(prisma, category))
+                }
+            )))
+            return categoriesWithCover
+        }
+    }),
+
+    read: defineOperation({
+        authorizer: () => articleCategoryAuth.read.dynamicFields({}),
+        paramsSchema: z.object({
+            name: z.string()
+        }),
+        operation: async ({ prisma, params }) => {
+            const category = await prisma.articleCategory.findUnique({
+                where: {
+                    name: params.name
+                },
+                include: {
+                    articles: {
+                        orderBy: {
+                            createdAt: 'desc'
+                        }
+                    }
+                },
+            })
+            if (!category) throw new ServerError('NOT FOUND', `Category ${params.name} not found`)
+            const categoryWithCover = {
+                ...category,
+                coverImage: await getCoverImage(prisma, category)
+            }
+            return categoryWithCover
+        }
+    }),
+
+    readArticleInCategory: articleOperations.read.implement({
+        authorizer: () => articleCategoryAuth.readArticleInCategory.dynamicFields({}),
+        implementationParamsSchema: z.object({
+            articleCategoryName: z.string()
+        }),
+        ownershipCheck: async ({ prisma, params, implementationParams }) => {
+            const article = await prisma.article.findUnique({
+                where: {
+                    id: params.articleId
+                }
+            })
+            const articleCategoryId = await prisma.articleCategory.findUniqueOrThrow({
+                where: {
+                    name: implementationParams.articleCategoryName
+                },
+                select: {
+                    id: true
+                }
+            }).then(res => res.id)
+            if (!article) throw new ServerError('NOT FOUND', 'Artikkel ikke funnet.')
+            return article.articleCategoryId ? article.articleCategoryId === articleCategoryId : false
+        }
+    })
+} as const
+
+/**
+ * Get coverimage (not cmsImage just the image it relates to) for article category
+ * Returns coverImage of a article in the category. The cover image for the category is the cover
+ * image of the first article in the category.
+ * @param category - The category to get cover image for
+ * @returns The cover image of the category
+ */
+async function getCoverImage(
+    prisma: PrismaPossibleTransaction<false>,
+    category: ExpandedArticleCategory
+): Promise<Image | null> {
+    if (category.articles.length === 0) return null
+    const coverImage = await prisma.cmsImage.findUnique({
+        where: {
+            id: category.articles[0].coverImageId
+        },
+        include: {
+            image: true
+        }
+    })
+    if (!coverImage) return null
+    if (!coverImage.image) return null
+    return coverImage.image
+}
diff --git a/src/services/articleCategories/schemas.ts b/src/services/articleCategories/schemas.ts
new file mode 100644
index 000000000..b097b43c7
--- /dev/null
+++ b/src/services/articleCategories/schemas.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod'
+
+const baseSchema = z.object({
+    name: z.string().min(2, 'Minmum lengde er 2.').max(18, 'Maks lengde er 2.').trim(),
+    description: z.string().max(70, 'Maks lengde er 70.'),
+})
+
+export const articleCategorySchemas = {
+    create: baseSchema.pick({
+        name: true,
+        description: true
+    }),
+    update: baseSchema.pick({
+        name: true,
+        description: true
+    }).partial()
+} as const
diff --git a/src/services/cms/articleCategories/types.ts b/src/services/articleCategories/types.ts
similarity index 100%
rename from src/services/cms/articleCategories/types.ts
rename to src/services/articleCategories/types.ts
diff --git a/src/services/cabin/actions.ts b/src/services/cabin/actions.ts
index cbff4f407..7a1429640 100644
--- a/src/services/cabin/actions.ts
+++ b/src/services/cabin/actions.ts
@@ -25,6 +25,13 @@ export const readCabinAvailabilityAction = makeAction(cabinBookingOperations.rea
 export const readCabinBookingsAction = makeAction(cabinBookingOperations.readMany)
 export const readCabinBookingAction = makeAction(cabinBookingOperations.read)
 
+export const readSpecialCmsParagraphCabinContractAction = makeAction(
+    cabinBookingOperations.readSpecialCmsParagraphCabinContract
+)
+export const updateSpecialCmsParagraphCabinContractAction = makeAction(
+    cabinBookingOperations.updateSpecialCmsParagraphContentCabinContract
+)
+
 export const readCabinProductsAction = makeAction(cabinProductOperations.readMany)
 export const readCabinProductsActiveAction = makeAction(cabinProductOperations.readActive)
 export const readCabinProductAction = makeAction(cabinProductOperations.read)
diff --git a/src/services/cabin/booking/auth.ts b/src/services/cabin/booking/auth.ts
index 1b89907c0..08f9c8e90 100644
--- a/src/services/cabin/booking/auth.ts
+++ b/src/services/cabin/booking/auth.ts
@@ -29,5 +29,13 @@ export const cabinBookingAuth = {
     read: RequirePermission.staticFields({
         permission: 'CABIN_BOOKING_ADMIN'
     }),
+
+    readSpecialCmsParagraphCabinContract: RequirePermission.staticFields({
+        permission: 'CABIN_CALENDAR_READ'
+    }),
+
+    updateSpecialCmsParagraphContentCabinContract: RequirePermission.staticFields({
+        permission: 'CABIN_BOOKING_ADMIN'
+    })
 }
 
diff --git a/src/services/cabin/booking/operations.ts b/src/services/cabin/booking/operations.ts
index d48ec1fac..313894e1c 100644
--- a/src/services/cabin/booking/operations.ts
+++ b/src/services/cabin/booking/operations.ts
@@ -11,6 +11,7 @@ import { ServerError } from '@/services/error'
 import { cabinReleasePeriodOperations } from '@/services/cabin/releasePeriod/operations'
 import { sendSystemMail } from '@/services/notifications/email/send'
 import { notificationOperations } from '@/services/notifications/operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
 import { z } from 'zod'
 import { BookingType } from '@prisma/client'
 import type { CabinProductExtended } from '@/services/cabin/product/constants'
@@ -361,5 +362,26 @@ export const cabinBookingOperations = {
             where: params,
             include: cabinBookingIncluder,
         })
+    }),
+
+    readSpecialCmsParagraphCabinContract: cmsParagraphOperations.readSpecial.implement({
+        authorizer: () => cabinBookingAuth
+            .readSpecialCmsParagraphCabinContract
+            .dynamicFields({}),
+        ownershipCheck: ({ params }) => params.special === 'CABIN_CONTRACT'
+    }),
+
+    updateSpecialCmsParagraphContentCabinContract: cmsParagraphOperations.updateContent.implement({
+        authorizer: () => cabinBookingAuth
+            .updateSpecialCmsParagraphContentCabinContract
+            .dynamicFields({}),
+        ownershipCheck: async ({ params }) =>
+            await cmsParagraphOperations.isSpecial({
+                params: {
+                    paragraphId: params.paragraphId,
+                    special: ['CABIN_CONTRACT']
+                },
+                bypassAuth: true
+            })
     })
 }
diff --git a/src/services/career/actions.ts b/src/services/career/actions.ts
new file mode 100644
index 000000000..e16cf4f63
--- /dev/null
+++ b/src/services/career/actions.ts
@@ -0,0 +1,10 @@
+'use server'
+import { careerOperations } from './operations'
+import { makeAction } from '@/services/serverAction'
+
+export const readSpecialCmsParagraphCareerInfo = makeAction(
+    careerOperations.readSpecialCmsParagraphCareerInfo
+)
+export const updateSpecialCmsParagraphContentCareerInfo = makeAction(
+    careerOperations.updateSpecialCmsParagraphContentCareerInfo
+)
diff --git a/src/services/career/auth.ts b/src/services/career/auth.ts
new file mode 100644
index 000000000..39d3cf768
--- /dev/null
+++ b/src/services/career/auth.ts
@@ -0,0 +1,9 @@
+import { RequireNothing } from '@/auth/auther/RequireNothing'
+import { RequireOneOfPermission } from '@/auth/auther/RequireOneOfPermission'
+
+export const careerAuth = {
+    readSpecialCmsParagraphCareerInfo: RequireNothing.staticFields({}),
+    updateSpecialCmsParagraphContentCareerInfo: RequireOneOfPermission.staticFields({
+        permissions: ['JOBAD_UPDATE', 'COMMITTEE_UPDATE']
+    })
+}
diff --git a/src/services/career/companies/actions.ts b/src/services/career/companies/actions.ts
index 307bda7ec..12a02a7e0 100644
--- a/src/services/career/companies/actions.ts
+++ b/src/services/career/companies/actions.ts
@@ -9,4 +9,10 @@ export const destroyCompanyAction = makeAction(companyOperations.destroy)
 
 export const readCompanyPageAction = makeAction(companyOperations.readPage)
 
-export const updateComanyAction = makeAction(companyOperations.update)
+export const updateCompanyAction = makeAction(companyOperations.update)
+
+export const updateCompanyCmsLogoAction = makeAction(companyOperations.updateCmsImageLogo)
+
+export const readCompanySpecialCmsLinkAction = makeAction(companyOperations.readSpecialCmsLink)
+
+export const updateCompanySpecialCmsLinkAction = makeAction(companyOperations.updateSpecialCmsLink)
diff --git a/src/services/career/companies/auth.ts b/src/services/career/companies/auth.ts
index 5fe8b7a68..7d2898839 100644
--- a/src/services/career/companies/auth.ts
+++ b/src/services/career/companies/auth.ts
@@ -4,5 +4,8 @@ export const companyAuth = {
     create: RequirePermission.staticFields({ permission: 'COMPANY_ADMIN' }),
     readPage: RequirePermission.staticFields({ permission: 'COMPANY_READ' }),
     update: RequirePermission.staticFields({ permission: 'COMPANY_ADMIN' }),
+    updateCmsImageLogo: RequirePermission.staticFields({ permission: 'COMPANY_ADMIN' }),
+    updateSpecialCmsLink: RequirePermission.staticFields({ permission: 'COMPANY_ADMIN' }),
+    readSpecialCmsLink: RequirePermission.staticFields({ permission: 'COMPANY_READ' }),
     destroy: RequirePermission.staticFields({ permission: 'COMPANY_ADMIN' }),
 }
diff --git a/src/services/career/companies/operations.ts b/src/services/career/companies/operations.ts
index 0446e614c..5fb0650cd 100644
--- a/src/services/career/companies/operations.ts
+++ b/src/services/career/companies/operations.ts
@@ -2,11 +2,11 @@ import '@pn-server-only'
 import { companyAuth } from './auth'
 import { logoIncluder } from './constants'
 import { companySchemas } from './schemas'
-import { createCmsImage } from '@/services/cms/images/create'
 import { defineOperation } from '@/services/serviceOperation'
 import { cursorPageingSelection } from '@/lib/paging/cursorPageingSelection'
 import { readPageInputSchemaObject } from '@/lib/paging/schema'
-import { v4 as uuid } from 'uuid'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { cmsLinkOperations } from '@/cms/links/operations'
 import { z } from 'zod'
 
 export const companyOperations = {
@@ -15,7 +15,7 @@ export const companyOperations = {
         authorizer: () => companyAuth.create.dynamicFields({}),
         operation: async ({ prisma, data }) => {
             //TODO: tranaction when createCmsImage is service operation.
-            const logo = await createCmsImage({ name: uuid() })
+            const logo = await cmsImageOperations.create({ data: {}, bypassAuth: true })
             return await prisma.company.create({
                 data: {
                     ...data,
@@ -59,6 +59,31 @@ export const companyOperations = {
             })
         },
     }),
+    updateCmsImageLogo: cmsImageOperations.update.implement({
+        implementationParamsSchema: z.object({
+            companyId: z.number(),
+        }),
+        authorizer: () => companyAuth.updateCmsImageLogo.dynamicFields({}),
+        ownershipCheck: async ({ implementationParams, params, prisma }) =>
+            (await prisma.company.findUniqueOrThrow({
+                where: { id: implementationParams.companyId },
+                select: { logoId: true }
+            }))?.logoId === params.cmsImageId
+    }),
+    readSpecialCmsLink: cmsLinkOperations.readSpecial.implement({
+        authorizer: () => companyAuth.readSpecialCmsLink.dynamicFields({}),
+        ownershipCheck: ({ params }) => params.special === 'CAREER_LINK_TO_CONTACTOR'
+    }),
+    updateSpecialCmsLink: cmsLinkOperations.update.implement({
+        authorizer: () => companyAuth.updateSpecialCmsLink.dynamicFields({}),
+        ownershipCheck: ({ params }) =>
+            cmsLinkOperations.isSpecial({
+                params: {
+                    linkId: params.linkId,
+                    special: ['CAREER_LINK_TO_CONTACTOR']
+                }
+            })
+    }),
     destroy: defineOperation({
         paramsSchema: z.object({
             id: z.number()
diff --git a/src/services/career/jobAds/actions.ts b/src/services/career/jobAds/actions.ts
index 040ae8daf..21ff14c26 100644
--- a/src/services/career/jobAds/actions.ts
+++ b/src/services/career/jobAds/actions.ts
@@ -1,14 +1,41 @@
 'use server'
-
 import { makeAction } from '@/services/serverAction'
 import { jobAdOperations } from '@/services/career/jobAds/operations'
 
 export const createJobAdAction = makeAction(jobAdOperations.create)
-
 export const destroyJobAdAction = makeAction(jobAdOperations.destroy)
-
 export const readJobAdAction = makeAction(jobAdOperations.read)
 export const readActiveJobAdsAction = makeAction(jobAdOperations.readActive)
 export const readInactiveJobAdsPageAction = makeAction(jobAdOperations.readInactivePage)
-
 export const updateJobAdAction = makeAction(jobAdOperations.update)
+
+export const updateJobAdArticleAction = makeAction(
+    jobAdOperations.updateArticle.update
+)
+export const updateJobAdArticleAddSectionAction = makeAction(
+    jobAdOperations.updateArticle.addSection
+)
+export const updateJobAdArticleReorderSectionsAction = makeAction(
+    jobAdOperations.updateArticle.reorderSections
+)
+export const updateJobAdArticleCoverImageAction = makeAction(
+    jobAdOperations.updateArticle.coverImage
+)
+export const updateJobAdArticleSectionAction = makeAction(
+    jobAdOperations.updateArticle.articleSections.update
+)
+export const updateJobAdArticleSectionsAddPartAction = makeAction(
+    jobAdOperations.updateArticle.articleSections.addPart
+)
+export const updateJobAdArticleSectionsRemovePartAction = makeAction(
+    jobAdOperations.updateArticle.articleSections.removePart
+)
+export const updateJobAdArticleCmsImageAction = makeAction(
+    jobAdOperations.updateArticle.articleSections.cmsImage
+)
+export const updateJobAdArticleCmsParagraphAction = makeAction(
+    jobAdOperations.updateArticle.articleSections.cmsParagraph
+)
+export const updateJobAdArticleCmsLinkAction = makeAction(
+    jobAdOperations.updateArticle.articleSections.cmsLink
+)
diff --git a/src/services/career/jobAds/auth.ts b/src/services/career/jobAds/auth.ts
index 86b6543aa..9aab30e03 100644
--- a/src/services/career/jobAds/auth.ts
+++ b/src/services/career/jobAds/auth.ts
@@ -6,5 +6,6 @@ export const jobAdAuth = {
     readActive: RequirePermission.staticFields({ permission: 'JOBAD_READ' }),
     readInactivePage: RequirePermission.staticFields({ permission: 'JOBAD_READ' }),
     update: RequirePermission.staticFields({ permission: 'JOBAD_UPDATE' }),
+    updateArticle: RequirePermission.staticFields({ permission: 'JOBAD_UPDATE' }),
     destroy: RequirePermission.staticFields({ permission: 'JOBAD_DESTROY' }),
 }
diff --git a/src/services/career/jobAds/constants.ts b/src/services/career/jobAds/constants.ts
index c9b7c5879..a3670e48d 100644
--- a/src/services/career/jobAds/constants.ts
+++ b/src/services/career/jobAds/constants.ts
@@ -1,4 +1,4 @@
-import { articleRealtionsIncluder } from '@/cms/articles/ConfigVars'
+import { articleRealtionsIncluder } from '@/cms/articles/constants'
 import { JobType } from '@prisma/client'
 import type { Prisma } from '@prisma/client'
 
diff --git a/src/services/career/jobAds/operations.ts b/src/services/career/jobAds/operations.ts
index 5c2557563..4ed0e2aa2 100644
--- a/src/services/career/jobAds/operations.ts
+++ b/src/services/career/jobAds/operations.ts
@@ -4,20 +4,38 @@ import { jobAdSchemas } from './schemas'
 import { articleAndCompanyIncluder, simpleArticleAndCompanyIncluder } from './constants'
 import { logoIncluder } from '@/services/career/companies/constants'
 import { defineOperation } from '@/services/serviceOperation'
-import { createArticle } from '@/services/cms/articles/create'
 import { readPageInputSchemaObject } from '@/lib/paging/schema'
 import { cursorPageingSelection } from '@/lib/paging/cursorPageingSelection'
-import { destroyArticle } from '@/services/cms/articles/destroy'
+import { articleOperations } from '@/cms/articles/operations'
+import { implementUpdateArticleOperations } from '@/cms/articles/implement'
 import { z } from 'zod'
 import { JobType } from '@prisma/client'
 import type { ExpandedJobAd, SimpleJobAd } from './types'
 
+const read = defineOperation({
+    paramsSchema: z.object({
+        id: z.number()
+    }),
+    authorizer: () => jobAdAuth.read.dynamicFields({}),
+    operation: async ({ prisma, params }): Promise<ExpandedJobAd> => await prisma.jobAd.findUniqueOrThrow({
+        where: {
+            id: params.id,
+        },
+        include: {
+            ...articleAndCompanyIncluder,
+            company: {
+                include: logoIncluder,
+            }
+        }
+    })
+})
+
 export const jobAdOperations = {
     create: defineOperation({
         dataSchema: jobAdSchemas.create,
         authorizer: () => jobAdAuth.create.dynamicFields({}),
         operation: async ({ prisma, data: { articleName, companyId, ...data } }) => {
-            const article = await createArticle({ name: articleName })
+            const article = await articleOperations.create({ data: { name: articleName }, bypassAuth: true })
 
             return await prisma.jobAd.create({
                 data: {
@@ -41,23 +59,7 @@ export const jobAdOperations = {
      * @param idOrName - id or articleName and order of jobAd to read (id or {articleName: string, order: number})
      * @returns ExpandedJobAd - the jobAd and its article
      */
-    read: defineOperation({
-        paramsSchema: z.object({
-            id: z.number()
-        }),
-        authorizer: () => jobAdAuth.read.dynamicFields({}),
-        operation: async ({ prisma, params }): Promise<ExpandedJobAd> => await prisma.jobAd.findUniqueOrThrow({
-            where: {
-                id: params.id,
-            },
-            include: {
-                ...articleAndCompanyIncluder,
-                company: {
-                    include: logoIncluder,
-                }
-            }
-        })
-    }),
+    read,
     /**
      * This handler reads all active jobAds
      * @returns SimpleJobAd[] - all jobAds with coverImage
@@ -138,6 +140,16 @@ export const jobAdOperations = {
             data,
         })
     }),
+    updateArticle: implementUpdateArticleOperations({
+        authorizer: () => jobAdAuth.updateArticle.dynamicFields({}),
+        implementationParamsSchema: z.object({
+            jobAdId: z.number(),
+        }),
+        ownedArticles: async ({ implementationParams }) => {
+            const jobAd = await read({ params: { id: implementationParams.jobAdId }, bypassAuth: true })
+            return [jobAd.article]
+        }
+    }),
     destroy: defineOperation({
         paramsSchema: z.object({
             id: z.number(),
@@ -147,7 +159,7 @@ export const jobAdOperations = {
             const jobAd = await prisma.jobAd.delete({
                 where: { id },
             })
-            await destroyArticle(jobAd.articleId)
+            await articleOperations.destroy({ params: { articleId: jobAd.articleId }, bypassAuth: true })
         }
     }),
 }
diff --git a/src/services/career/operations.ts b/src/services/career/operations.ts
new file mode 100644
index 000000000..79b557ca0
--- /dev/null
+++ b/src/services/career/operations.ts
@@ -0,0 +1,19 @@
+import '@pn-server-only'
+import { careerAuth } from './auth'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+
+export const careerOperations = {
+    readSpecialCmsParagraphCareerInfo: cmsParagraphOperations.readSpecial.implement({
+        authorizer: () => careerAuth.readSpecialCmsParagraphCareerInfo.dynamicFields({}),
+        ownershipCheck: ({ params }) => params.special === 'CAREER_INFO'
+    }),
+
+    updateSpecialCmsParagraphContentCareerInfo: cmsParagraphOperations.updateContent.implement({
+        authorizer: () => careerAuth.updateSpecialCmsParagraphContentCareerInfo.dynamicFields({}),
+        ownershipCheck: async ({ params }) =>
+            await cmsParagraphOperations.isSpecial({
+                params: { paragraphId: params.paragraphId, special: ['CAREER_INFO'] },
+                bypassAuth: true,
+            })
+    })
+}
diff --git a/src/services/cms/articleCategories/actions.ts b/src/services/cms/articleCategories/actions.ts
deleted file mode 100644
index 38ae040a3..000000000
--- a/src/services/cms/articleCategories/actions.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-'use server'
-
-import { createZodActionError, safeServerCall } from '@/services/actionError'
-import { createArticleCategory } from '@/services/cms/articleCategories/create'
-import { destroyArticleCategory } from '@/services/cms/articleCategories/destroy'
-import { readArticleCategories, readArticleCategory } from '@/services/cms/articleCategories/read'
-import { updateArticleCategory } from '@/services/cms/articleCategories/update'
-import {
-    createArticleCategoryValidation,
-    updateArticleCategoryValidation,
-} from '@/services/cms/articleCategories/validation'
-import type {
-    ArticleCategoryWithCover,
-    ExpandedArticleCategoryWithCover,
-    ExpandedArticleCategory,
-} from '@/cms/articleCategories/types'
-import type { ActionReturn } from '@/services/actionTypes'
-import type { CreateArticleCategoryTypes, UpdateArticleCategoryTypes } from '@/services/cms/articleCategories/validation'
-
-export async function createArticleCategoryAction(
-    rawData: FormData | CreateArticleCategoryTypes['Type']
-): Promise<ActionReturn<ExpandedArticleCategory>> {
-    //TODO: check permission
-    const parse = createArticleCategoryValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createArticleCategory(data))
-}
-
-export async function destroyArticleCategoryAction(id: number): Promise<ActionReturn<ExpandedArticleCategory>> {
-    // TODO: Cheek for visibility type edit of user.
-    return await safeServerCall(() => destroyArticleCategory(id))
-}
-
-export async function readArticleCategoriesAction(): Promise<ActionReturn<ArticleCategoryWithCover[]>> {
-    //TODO: only read categories that user has visibility
-    return await safeServerCall(() => readArticleCategories())
-}
-
-export async function readArticleCategoryAction(name: string): Promise<ActionReturn<ExpandedArticleCategoryWithCover>> {
-    //TODO: only read if right visibility
-    return await safeServerCall(() => readArticleCategory(name))
-}
-
-export async function updateArticleCategoryVisibilityAction(
-    // disable eslint rule temporarily until function is implemented
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    id: number,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    visibility: unknown
-): Promise<ActionReturn<ExpandedArticleCategory>> {
-    throw new Error('Not implemented')
-}
-
-export async function updateArticleCategoryAction(
-    id: number,
-    rawData: FormData | UpdateArticleCategoryTypes['Type']
-): Promise<ActionReturn<ExpandedArticleCategory>> {
-    const parse = updateArticleCategoryValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => updateArticleCategory(id, data))
-}
diff --git a/src/services/cms/articleCategories/create.ts b/src/services/cms/articleCategories/create.ts
deleted file mode 100644
index 9fcb1a319..000000000
--- a/src/services/cms/articleCategories/create.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import '@pn-server-only'
-import { createArticleCategoryValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CreateArticleCategoryTypes } from './validation'
-import type { ExpandedArticleCategory } from './types'
-
-export async function createArticleCategory(
-    rawData: CreateArticleCategoryTypes['Detailed']
-): Promise<ExpandedArticleCategory> {
-    const data = createArticleCategoryValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.articleCategory.create({
-        data,
-        include: {
-            articles: true
-        },
-    }))
-}
diff --git a/src/services/cms/articleCategories/destroy.ts b/src/services/cms/articleCategories/destroy.ts
deleted file mode 100644
index eb4fde3b6..000000000
--- a/src/services/cms/articleCategories/destroy.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { ExpandedArticleCategory } from '@/cms/articleCategories/types'
-
-export async function destroyArticleCategory(id: number): Promise<ExpandedArticleCategory> {
-    return await prismaCall(() => prisma.articleCategory.delete({
-        where: {
-            id
-        },
-        include: {
-            articles: true
-        }
-    }))
-}
diff --git a/src/services/cms/articleCategories/read.ts b/src/services/cms/articleCategories/read.ts
deleted file mode 100644
index 246783a58..000000000
--- a/src/services/cms/articleCategories/read.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import { ServerError } from '@/services/error'
-import type { Image } from '@prisma/client'
-import type {
-    ExpandedArticleCategory,
-    ExpandedArticleCategoryWithCover,
-    ArticleCategoryWithCover,
-} from '@/cms/articleCategories/types'
-
-/**
- * Reads all article categories, and assaigs each of them a cover based on the cover of first article
- * in each category.
- * @returns - the article categories with a cover.
- */
-export async function readArticleCategories(): Promise<ArticleCategoryWithCover[]> {
-    const categories = await prismaCall(() => prisma.articleCategory.findMany({
-        include: {
-            articles: {
-                take: 1,
-                include: {
-                    coverImage: true
-                }
-            },
-        },
-        orderBy: {
-            createdAt: 'desc'
-        }
-    }))
-    const categoriesWithCover = await Promise.all(categories.map(async category => (
-        {
-            ...category,
-            coverImage: (await getCoverImage(category))
-        }
-    )))
-    return categoriesWithCover
-}
-
-
-/**
- * Reads an articleCategory, and chooses an coverimage as first articles cover.
- * Also returns all the articles in the category.
- * @param name - THe name of the article category to read
- * @returns - Article with chosen cover image
- */
-export async function readArticleCategory(name: string): Promise<ExpandedArticleCategoryWithCover> {
-    const category = await prismaCall(() => prisma.articleCategory.findUnique({
-        where: {
-            name
-        },
-        include: {
-            articles: {
-                orderBy: {
-                    createdAt: 'desc'
-                }
-            }
-        },
-    }))
-    if (!category) throw new ServerError('NOT FOUND', `Category ${name} not found`)
-    const categoryWithCover = {
-        ...category,
-        coverImage: await getCoverImage(category)
-    }
-    return categoryWithCover
-}
-
-/**
- * Get coverimage (not cmsImage just the image it relates to) for article category
- * Returns coverImage of a article in the category. The cover image for the category is the cover
- * image of the first article in the category.
- * @param category - The category to get cover image for
- * @returns The cover image of the category
- */
-async function getCoverImage(category: ExpandedArticleCategory): Promise<Image | null> {
-    if (category.articles.length === 0) return null
-    const coverImage = await prismaCall(() => prisma.cmsImage.findUnique({
-        where: {
-            id: category.articles[0].coverImageId
-        },
-        include: {
-            image: true
-        }
-    }))
-    if (!coverImage) return null
-    if (!coverImage.image) return null
-    return coverImage.image
-}
diff --git a/src/services/cms/articleCategories/update.ts b/src/services/cms/articleCategories/update.ts
deleted file mode 100644
index ab9f61ca0..000000000
--- a/src/services/cms/articleCategories/update.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import '@pn-server-only'
-import { updateArticleCategoryValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { UpdateArticleCategoryTypes } from './validation'
-import type { ExpandedArticleCategory } from '@/cms/articleCategories/types'
-
-export async function updateArticleCategory(
-    id: number,
-    rawData: UpdateArticleCategoryTypes['Detailed'],
-): Promise<ExpandedArticleCategory> {
-    const data = updateArticleCategoryValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.articleCategory.update({
-        where: {
-            id
-        },
-        data,
-        include: {
-            articles: true
-        }
-    }))
-}
diff --git a/src/services/cms/articleCategories/validation.ts b/src/services/cms/articleCategories/validation.ts
deleted file mode 100644
index 48cefc9f8..000000000
--- a/src/services/cms/articleCategories/validation.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseArticleCategoryValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-        description: z.string(),
-    },
-    details: {
-        name: z.string().min(2, 'Minmum lengde er 2.').max(18, 'Maks lengde er 2.').trim(),
-        description: z.string().max(70, 'Maks lengde er 70.'),
-    }
-})
-
-export const createArticleCategoryValidation = baseArticleCategoryValidation.createValidation({
-    keys: ['name', 'description'],
-    transformer: data => data
-})
-export type CreateArticleCategoryTypes = ValidationTypes<typeof createArticleCategoryValidation>
-
-export const updateArticleCategoryValidation = baseArticleCategoryValidation.createValidationPartial({
-    keys: ['name', 'description'],
-    transformer: data => data
-})
-export type UpdateArticleCategoryTypes = ValidationTypes<typeof updateArticleCategoryValidation>
diff --git a/src/services/cms/articleSections/actions.ts b/src/services/cms/articleSections/actions.ts
deleted file mode 100644
index abadb9574..000000000
--- a/src/services/cms/articleSections/actions.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-'use server'
-
-import { createZodActionError, safeServerCall } from '@/services/actionError'
-import { createArticleSection } from '@/services/cms/articleSections/create'
-import { destroyArticleSection } from '@/services/cms/articleSections/destroy'
-import { readArticleSection } from '@/services/cms/articleSections/read'
-import { addArticleSectionPart, removeArticleSectionPart, updateArticleSection } from '@/services/cms/articleSections/update'
-import { createArticleSectionValidation } from '@/services/cms/articleSections/validation'
-import type { ArticleSectionPart, ExpandedArticleSection } from '@/cms/articleSections/types'
-import type { ActionReturn } from '@/services/actionTypes'
-import type { CreateArticleSectionTypes } from '@/services/cms/articleSections/validation'
-import type { ArticleSection, Position } from '@prisma/client'
-
-export async function createArticleSectionAction(
-    rawData: FormData | CreateArticleSectionTypes['Type'],
-): Promise<ActionReturn<ExpandedArticleSection>> {
-    //TODO: Auth on general cms permission
-    const parse = createArticleSectionValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createArticleSection(data))
-}
-
-export async function destroyArticleSectionAction(nameOrId: string): Promise<ActionReturn<ArticleSection>> {
-    //Auth by visibility
-    return await safeServerCall(() => destroyArticleSection(nameOrId))
-}
-
-export async function readArticleSectionAction(name: string): Promise<ActionReturn<ExpandedArticleSection>> {
-    //TODO: Auth by visibility
-    return await safeServerCall(() => readArticleSection(name))
-}
-
-export async function updateArticleSectionAction(name: string, changes: {
-    imageSize?: number,
-    imagePosition?: Position,
-}): Promise<ActionReturn<ExpandedArticleSection>> {
-    //Todo: Auth by visibilty
-    return await safeServerCall(() => updateArticleSection(name, changes))
-}
-
-export async function addArticleSectionPartAction(
-    name: string,
-    part: ArticleSectionPart
-): Promise<ActionReturn<ExpandedArticleSection>> {
-    //Todo: Auth by visibilty
-    return await safeServerCall(() => addArticleSectionPart(name, part))
-}
-
-export async function removeArticleSectionPartAction(
-    name: string,
-    part: ArticleSectionPart
-): Promise<ActionReturn<ArticleSection>> {
-    //TODO: Auth by visibility
-    return await safeServerCall(() => removeArticleSectionPart(name, part))
-}
diff --git a/src/services/cms/articleSections/ConfigVars.ts b/src/services/cms/articleSections/constants.ts
similarity index 100%
rename from src/services/cms/articleSections/ConfigVars.ts
rename to src/services/cms/articleSections/constants.ts
diff --git a/src/services/cms/articleSections/create.ts b/src/services/cms/articleSections/create.ts
deleted file mode 100644
index 4dfa268d0..000000000
--- a/src/services/cms/articleSections/create.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import '@pn-server-only'
-import { articleSectionsRealtionsIncluder } from './ConfigVars'
-import { createArticleSectionValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CreateArticleSectionTypes } from './validation'
-import type { ExpandedArticleSection } from './types'
-
-/**
- * A function to create a new articleSection
- * @param name - The name of the article section to create
- * @returns
- */
-export async function createArticleSection(
-    rawData: CreateArticleSectionTypes['Detailed']
-): Promise<ExpandedArticleSection> {
-    const data = createArticleSectionValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.articleSection.create({
-        data,
-        include: articleSectionsRealtionsIncluder,
-    }))
-}
diff --git a/src/services/cms/articleSections/destroy.ts b/src/services/cms/articleSections/destroy.ts
deleted file mode 100644
index 1ffbce482..000000000
--- a/src/services/cms/articleSections/destroy.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { ArticleSection } from '@prisma/client'
-
-/**
- * Destroys an article section
- * @param nameOrId - The name or id of the article section to destroy
- * @returns
- */
-export async function destroyArticleSection(nameOrId: string | number): Promise<ArticleSection> {
-    return await prismaCall(() => prisma.articleSection.delete({
-        where: {
-            name: typeof nameOrId === 'string' ? nameOrId : undefined,
-            id: typeof nameOrId === 'number' ? nameOrId : undefined
-        },
-    }))
-}
diff --git a/src/services/cms/articleSections/implement.ts b/src/services/cms/articleSections/implement.ts
new file mode 100644
index 000000000..95fff1c13
--- /dev/null
+++ b/src/services/cms/articleSections/implement.ts
@@ -0,0 +1,116 @@
+import '@pn-server-only'
+import { articleSectionOperations } from './operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { cmsLinkOperations } from '@/cms/links/operations'
+import type { articleSectionSchemas } from './schemas'
+import type { AutherResult } from '@/auth/auther/Auther'
+import type { Prisma } from '@prisma/client'
+import type { z } from 'zod'
+import type { ArgsAuthGetterAndOwnershipCheck, PrismaPossibleTransaction } from '@/services/serviceOperation'
+
+type ParamsSchema = typeof articleSectionSchemas.params
+type OwnedArticleSections = Prisma.ArticleSectionGetPayload<{
+    include: {
+        cmsImage: true,
+        cmsParagraph: true,
+        cmsLink: true,
+    }
+}>
+/**
+ * This utility implements all the needed update operations for an article section and
+ * the assosiated cms: CmsLink, CmsParagraph, CmsImage
+ */
+export function implementUpdateArticleSectionOperations<
+    const ImplementationParamsSchema extends z.ZodTypeAny
+>({
+    implementationParamsSchema,
+    authorizer,
+    ownedArticleSections,
+    destroyOnEmpty
+}: {
+    implementationParamsSchema: ImplementationParamsSchema,
+    authorizer: (
+        args: {
+            prisma: PrismaPossibleTransaction<false>,
+            implementationParams: z.infer<ImplementationParamsSchema>
+        }
+    ) => AutherResult | Promise<AutherResult>,
+    ownedArticleSections: (
+        args: {
+            prisma: PrismaPossibleTransaction<false>,
+            implementationParams: z.infer<ImplementationParamsSchema>
+        }
+    ) => Promise<OwnedArticleSections[]>
+    destroyOnEmpty: boolean
+}) {
+    const ownershipCheckArticleSection = async (
+        args: Omit<ArgsAuthGetterAndOwnershipCheck<false, ParamsSchema, undefined, ImplementationParamsSchema>, 'data'>
+    ) => {
+        const ownedArticleSectionsComputed = await ownedArticleSections(args)
+        const ownedIds = ownedArticleSectionsComputed.map(section => section.id)
+        const ownedNames = ownedArticleSectionsComputed.map(section => section.name)
+        if (args.params.articleSectionId) return ownedIds.includes(args.params.articleSectionId)
+        if (args.params.articleSectionName) return ownedNames.includes(args.params.articleSectionName)
+        return false //This should never happen
+    }
+
+    const getOwnedIds = async (
+        args: {
+            prisma: PrismaPossibleTransaction<false>,
+            implementationParams: z.infer<ImplementationParamsSchema>
+        }
+    ) => {
+        const ownedArticleSectionsComputed = await ownedArticleSections(args)
+        return {
+            paragraphIds: ownedArticleSectionsComputed.map(
+                section => section.cmsParagraph?.id).filter(id => id !== undefined),
+            cmsImageIds: ownedArticleSectionsComputed.map(section => section.cmsImage?.id).filter(id => id !== undefined),
+            linkIds: ownedArticleSectionsComputed.map(section => section.cmsLink?.id).filter(id => id !== undefined),
+        }
+    }
+
+    return {
+        update: articleSectionOperations.update.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: ownershipCheckArticleSection,
+        }),
+        addPart: articleSectionOperations.addPart.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: ownershipCheckArticleSection,
+        }),
+        removePart: articleSectionOperations.removePart.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: ownershipCheckArticleSection,
+            operationImplementationFields: { destroyOnEmpty }
+        }),
+        cmsParagraph: cmsParagraphOperations.updateContent.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: async (args) => {
+                const { paragraphIds } = await getOwnedIds(args)
+                return paragraphIds.includes(args.params.paragraphId)
+            }
+        }),
+        cmsImage: cmsImageOperations.update.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: async (args) => {
+                const { cmsImageIds } = await getOwnedIds(args)
+                return cmsImageIds.includes(args.params.cmsImageId)
+            }
+        }),
+        cmsLink: cmsLinkOperations.update.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: async (args) => {
+                const { linkIds } = await getOwnedIds(args)
+                return linkIds.includes(args.params.linkId)
+            }
+        })
+    } as const
+}
+
diff --git a/src/services/cms/articleSections/operations.ts b/src/services/cms/articleSections/operations.ts
new file mode 100644
index 000000000..dd30e33f8
--- /dev/null
+++ b/src/services/cms/articleSections/operations.ts
@@ -0,0 +1,203 @@
+import '@pn-server-only'
+import { articleSectionSchemas } from './schemas'
+import { articleSectionsRealtionsIncluder } from './constants'
+import { ServerOnly } from '@/auth/auther/ServerOnly'
+import { ServerError } from '@/services/error'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { cmsLinkOperations } from '@/cms/links/operations'
+import {
+    defineOperation,
+    defineSubOperation,
+} from '@/services/serviceOperation'
+
+const create = defineOperation({
+    authorizer: ServerOnly,
+    dataSchema: articleSectionSchemas.create,
+    operation: ({ prisma, data }) =>
+        prisma.articleSection.create({
+            data,
+            include: articleSectionsRealtionsIncluder
+        })
+})
+
+const destroy = defineOperation({
+    authorizer: ServerOnly,
+    paramsSchema: articleSectionSchemas.params,
+    operation: ({ prisma, params }) =>
+        prisma.articleSection.delete({
+            where: params.articleSectionId ? { id: params.articleSectionId } : { name: params.articleSectionName },
+            include: articleSectionsRealtionsIncluder
+        })
+})
+
+export const articleSectionOperations = {
+    create,
+    destroy,
+    /**
+     * This is the function that updates an article section metadata about how the (cms)image is displayed
+     * in the article section. It will also change the image size (resolution) based on the image size in
+     * the article section
+     * @param params - name or id
+     * @param data - The position and size data
+     */
+    update: defineSubOperation({
+        paramsSchema: () => articleSectionSchemas.params,
+        dataSchema: () => articleSectionSchemas.update,
+        operation: () => ({ prisma, params, data }) =>
+            prisma.articleSection.update({
+                where: params.articleSectionId ? { id: params.articleSectionId } : { name: params.articleSectionName },
+                data: {
+                    imageSize: data.imageSize,
+                    imagePosition: data.position,
+                    cmsImage: data.imageSize ? {
+                        update: {
+                            imageSize: data.imageSize > 250 ? 'MEDIUM' : 'SMALL',
+                        },
+                    } : undefined,
+                },
+                include: articleSectionsRealtionsIncluder,
+            })
+    }),
+
+    /**
+     * This is the function that adds a part to an article section. The part can be a cmsImage, cmsParagraph.
+     * If the part already exists in the article section, it will return an error
+     * If it does not it will create the part and add it to the article section
+     * @param params - The name or id of the article section to add the part to
+     * @param part - The part to add to the article section cmsImage, cmsParagraph or cmsLink
+     * @returns - The updated article section
+     */
+    addPart: defineSubOperation({
+        paramsSchema: () => articleSectionSchemas.params,
+        dataSchema: () => articleSectionSchemas.addPart,
+        operation: () => async ({ prisma, params, data }) => {
+            const where = params.articleSectionId ? { id: params.articleSectionId } : { name: params.articleSectionName }
+
+            const articleSection = await prisma.articleSection.findUnique({
+                where,
+                include: { [data.part]: true }
+            })
+            if (!articleSection) {
+                throw new ServerError('NOT FOUND', 'ArticleSection not found')
+            }
+            if (articleSection[data.part]) {
+                throw new ServerError('BAD PARAMETERS', `ArticleSection already has ${data.part}`)
+            }
+
+            switch (data.part) {
+                case 'cmsImage':
+                {
+                    const cmsImage = await cmsImageOperations.create({ data: {}, bypassAuth: true })
+                    return await prisma.articleSection.update({
+                        where,
+                        data: { cmsImage: { connect: { id: cmsImage.id } } },
+                        include: articleSectionsRealtionsIncluder
+                    })
+                }
+                case 'cmsParagraph':
+                {
+                    const cmsParagraph = await cmsParagraphOperations.create({ data: {}, bypassAuth: true })
+                    return await prisma.articleSection.update({
+                        where,
+                        data: { cmsParagraph: { connect: { id: cmsParagraph.id } } },
+                        include: articleSectionsRealtionsIncluder
+                    })
+                }
+                case 'cmsLink':
+                {
+                    const cmsLink = await cmsLinkOperations.create({ data: { text: 'lenke', url: './' }, bypassAuth: true })
+                    return await prisma.articleSection.update({
+                        where,
+                        data: { cmsLink: { connect: { id: cmsLink.id } } },
+                        include: articleSectionsRealtionsIncluder
+                    })
+                }
+                default:
+                    break
+            }
+            throw new ServerError('BAD PARAMETERS', 'Invalid part')
+        }
+    }),
+
+    /**
+     * This is a function that removes a part from an article section. The part can be a cmsImage, cmsParagraph.
+     * It does so by deleting the associated part from the database, in tern setting the part to null in the article section
+     * If the attribute destroyOnEmpty is true, it will also remove the article section if all parts are removed
+     * @param params - The name or id of the article section to remove the part from
+     * @param part - The part to remove from the article section cmsImage, cmsParagraph or cmsLink
+     * @param operationImplementationFields - destroyOnEmpty - this is an imporant atribute as when articles use a
+     * articleSection it wishes to remove the article section if all parts are removed, but if a service only uses
+     * one articleSection you do not want to delete it even if it has no content.
+     * @returns - The updated article section
+     */
+    removePart: defineSubOperation({
+        paramsSchema: () => articleSectionSchemas.params,
+        dataSchema: () => articleSectionSchemas.removePart,
+        operation: ({ destroyOnEmpty }: { destroyOnEmpty: boolean }) => async ({ prisma, params, data }) => {
+            const where = params.articleSectionId ? { id: params.articleSectionId } : { name: params.articleSectionName }
+            const articleSection = await prisma.articleSection.findUnique({
+                where,
+                include: { cmsLink: true, cmsParagraph: true, cmsImage: true }
+            })
+            if (!articleSection) {
+                throw new ServerError('NOT FOUND', 'ArticleSection not found')
+            }
+            if (!articleSection[data.part]) {
+                throw new ServerError('BAD PARAMETERS', `ArticleSection does not have ${data.part}`)
+            }
+
+            switch (data.part) {
+                case 'cmsLink':
+                    if (articleSection.cmsLink) {
+                        await cmsLinkOperations.destroy({
+                            params: { linkId: articleSection.cmsLink.id },
+                            bypassAuth: true
+                        })
+                    }
+                    break
+                case 'cmsParagraph':
+                    if (articleSection.cmsParagraph) {
+                        await cmsParagraphOperations.destroy({
+                            params: { paragraphId: articleSection.cmsParagraph.id },
+                            bypassAuth: true
+                        })
+                    }
+                    break
+                case 'cmsImage':
+                    if (articleSection.cmsImage) {
+                        await cmsImageOperations.destroy({
+                            params: { cmsImageId: articleSection.cmsImage.id },
+                            bypassAuth: true
+                        })
+                    }
+                    break
+                default:
+                    break
+            }
+
+            // check if all Parts are removed and if so, remove the articleSection,
+            // but only if destroyOnEmpty is true
+            const afterDelete = await prisma.articleSection.findUnique({
+                where,
+                include: { cmsParagraph: true, cmsImage: true, cmsLink: true }
+            })
+            if (!afterDelete) {
+                throw new ServerError('UNKNOWN ERROR', 'Noe uventet skjedde etter sletting av del av artclesection')
+            }
+            if (
+                destroyOnEmpty &&
+                !afterDelete.cmsImage &&
+                !afterDelete.cmsParagraph &&
+                !afterDelete.cmsLink
+            ) {
+                return await destroy({
+                    params: { articleSectionId: articleSection.id },
+                    bypassAuth: true
+                })
+            }
+
+            return afterDelete
+        }
+    })
+} as const
diff --git a/src/services/cms/articleSections/read.ts b/src/services/cms/articleSections/read.ts
deleted file mode 100644
index 49a1d6ed2..000000000
--- a/src/services/cms/articleSections/read.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import '@pn-server-only'
-import { articleSectionsRealtionsIncluder } from '@/cms/articleSections/ConfigVars'
-import { prisma } from '@/prisma/client'
-import { ServerError } from '@/services/error'
-import { prismaCall } from '@/services/prismaCall'
-import type { ExpandedArticleSection } from '@/cms/articleSections/types'
-
-/**
- * Reads an article section
- * @param nameOrId - The name or id of the article section to read
- * @returns
- */
-export async function readArticleSection(nameOrId: string | number): Promise<ExpandedArticleSection> {
-    const articleSection = await prismaCall(() => prisma.articleSection.findUnique({
-        where: {
-            name: typeof nameOrId === 'string' ? nameOrId : undefined,
-            id: typeof nameOrId === 'number' ? nameOrId : undefined
-        },
-        include: articleSectionsRealtionsIncluder
-    }))
-    if (!articleSection) throw new ServerError('NOT FOUND', 'Article section not found')
-    return articleSection
-}
diff --git a/src/services/cms/articleSections/schemas.ts b/src/services/cms/articleSections/schemas.ts
new file mode 100644
index 000000000..8e1dc13cc
--- /dev/null
+++ b/src/services/cms/articleSections/schemas.ts
@@ -0,0 +1,40 @@
+import { maxImageSize, minImageSize } from './constants'
+import { z } from 'zod'
+import { Position } from '@prisma/client'
+
+export const baseSchema = z.object({
+    name: z.string().min(2).max(100).optional(),
+    imageSize: z.number().transform(val => {
+        if (val < minImageSize) return minImageSize
+        if (val > maxImageSize) return maxImageSize
+        return val
+    }),
+    position: z.nativeEnum(Position),
+    part: z.union([z.literal('cmsLink'), z.literal('cmsImage'), z.literal('cmsParagraph')])
+})
+
+export const articleSectionSchemas = {
+    create: baseSchema.pick({
+        name: true,
+    }),
+    update: baseSchema.pick({
+        imageSize: true,
+        position: true
+    }).partial(),
+    addPart: baseSchema.pick({
+        part: true
+    }),
+    removePart: baseSchema.pick({
+        part: true
+    }),
+    params: z.union([
+        z.object({
+            articleSectionId: z.number(),
+            articleSectionName: z.undefined().optional()
+        }),
+        z.object({
+            articleSectionId: z.undefined().optional(),
+            articleSectionName: z.string()
+        })
+    ]),
+} as const
diff --git a/src/services/cms/articleSections/types.ts b/src/services/cms/articleSections/types.ts
index 581bb3b61..779f5b795 100644
--- a/src/services/cms/articleSections/types.ts
+++ b/src/services/cms/articleSections/types.ts
@@ -1,10 +1,16 @@
-import type { ExpandedCmsImage } from '@/cms/images/types'
-import type { ArticleSection, CmsParagraph, CmsLink } from '@prisma/client'
+import type { articleSectionsRealtionsIncluder } from './constants'
+import type { baseSchema } from './schemas'
+import type { z } from 'zod'
+import type { ActionFromSubServiceOperation } from '@/services/actionTypes'
+import type { articleSectionOperations } from './operations'
+import type { Prisma } from '@prisma/client'
 
-export type ArticleSectionPart = 'cmsLink' | 'cmsParagraph' | 'cmsImage'
+export type ArticleSectionPart = z.input<typeof baseSchema>['part']
 
-export type ExpandedArticleSection = ArticleSection & {
-    cmsImage: ExpandedCmsImage | null,
-    cmsParagraph: CmsParagraph | null,
-    cmsLink: CmsLink | null,
-}
+export type ExpandedArticleSection = Prisma.ArticleSectionGetPayload<{
+    include: typeof articleSectionsRealtionsIncluder
+}>
+
+export type UpdateArticleSectionAction = ActionFromSubServiceOperation<typeof articleSectionOperations.update>
+export type AddPartToArticleSectionAction = ActionFromSubServiceOperation<typeof articleSectionOperations.addPart>
+export type RemovePartFromArticleSectionAction = ActionFromSubServiceOperation<typeof articleSectionOperations.removePart>
diff --git a/src/services/cms/articleSections/update.ts b/src/services/cms/articleSections/update.ts
deleted file mode 100644
index d051b7de8..000000000
--- a/src/services/cms/articleSections/update.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import '@pn-server-only'
-import { destroyArticleSection } from './destroy'
-import { destroyCmsImage } from '@/services/cms/images/destoy'
-import { destroyCmsLink } from '@/services/cms/links/destroy'
-import { destroyCmsParagraph } from '@/services/cms/paragraphs/destroy'
-import { maxImageSize, minImageSize, articleSectionsRealtionsIncluder } from '@/cms/articleSections/ConfigVars'
-import { prisma } from '@/prisma/client'
-import { createCmsImage } from '@/services/cms/images/create'
-import { createCmsParagraph } from '@/services/cms/paragraphs/create'
-import { createCmsLink } from '@/services/cms/links/create'
-import { prismaCall } from '@/services/prismaCall'
-import { ServerError } from '@/services/error'
-import type { ImageSize, ArticleSection, Position, Prisma } from '@prisma/client'
-import type { ExpandedArticleSection, ArticleSectionPart } from '@/cms/articleSections/types'
-
-/**
- * This is the function that updates an article section metadata about how the (cms)image is displayed
- * in the article section. It will also change the image size (resolution) based on the image size in
- * the article section
- * @param nameOrId - The name or id of the article section to update
- * @param changes - The changes to make to the article section. imageSize is the size of
- * the image in pixels, imagePosition is the position of the image in the article section
- * @returns
- */
-export async function updateArticleSection(nameOrId: string | number, changes: {
-    imageSize?: number,
-    imagePosition?: Position,
-}): Promise<ExpandedArticleSection> {
-    //Sets the image resolution based on the image size
-    let newCmsImageResolution: ImageSize | undefined = undefined
-
-    if (changes.imageSize) {
-        if (changes.imageSize > maxImageSize) {
-            changes.imageSize = maxImageSize
-        }
-        if (changes.imageSize < minImageSize) {
-            changes.imageSize = minImageSize
-        }
-        newCmsImageResolution = 'SMALL'
-        if (changes.imageSize > 250) {
-            newCmsImageResolution = 'MEDIUM'
-        }
-    }
-
-    const articleSection = await prismaCall(() => prisma.articleSection.update({
-        where: {
-            name: typeof nameOrId === 'string' ? nameOrId : undefined,
-            id: typeof nameOrId === 'number' ? nameOrId : undefined
-        },
-        data: {
-            ...changes,
-            cmsImage: {
-                update: {
-                    imageSize: newCmsImageResolution,
-                },
-            },
-        },
-        include: articleSectionsRealtionsIncluder
-    }))
-    return articleSection
-}
-
-/**
- * This is the function that adds a part to an article section. The part can be a cmsImage, cmsParagraph.
- * If the part already exists in the article section, it will return an error
- * If it does not it will create the part and add it to the article section
- * @param nameOrId - The name or id of the article section to add the part to
- * @param part - The part to add to the article section cmsImage, cmsParagraph or cmsLink
- * @returns - The updated article section
- */
-export async function addArticleSectionPart(
-    nameOrId: string | number,
-    part: ArticleSectionPart
-): Promise<ExpandedArticleSection> {
-    const where = {
-        name: typeof nameOrId === 'string' ? nameOrId : undefined,
-        id: typeof nameOrId === 'number' ? nameOrId : undefined
-    } as const satisfies Prisma.ArticleSectionWhereUniqueInput
-
-    const articleSection = await prismaCall(() => prisma.articleSection.findUnique({
-        where,
-        include: { [part]: true }
-    }))
-    if (!articleSection) {
-        throw new ServerError('NOT FOUND', 'ArticleSection not found')
-    }
-    if (articleSection[part]) {
-        throw new ServerError('BAD PARAMETERS', `ArticleSection already has ${part}`)
-    }
-
-    switch (part) {
-        case 'cmsImage':
-        {
-            const cmsImage = await createCmsImage({ name: `${nameOrId}_image` })
-            return await prismaCall(() => prisma.articleSection.update({
-                where,
-                data: { cmsImage: { connect: { id: cmsImage.id } } },
-                include: articleSectionsRealtionsIncluder
-            }))
-        }
-        case 'cmsParagraph':
-        {
-            const cmsParagraph = await createCmsParagraph({ name: `${nameOrId}_paragraph` })
-            return await prismaCall(() => prisma.articleSection.update({
-                where,
-                data: { cmsParagraph: { connect: { id: cmsParagraph.id } } },
-                include: articleSectionsRealtionsIncluder
-            }))
-        }
-        case 'cmsLink':
-        {
-            const cmsLink = await createCmsLink({ name: `${nameOrId}_link` })
-            return await prismaCall(() => prisma.articleSection.update({
-                where,
-                data: { cmsLink: { connect: { id: cmsLink.id } } },
-                include: articleSectionsRealtionsIncluder
-            }))
-        }
-        default:
-            break
-    }
-    throw new ServerError('BAD PARAMETERS', 'Invalid part')
-}
-
-/**
- * This is a function that removes a part from an article section. The part can be a cmsImage, cmsParagraph.
- * It does so by deleting the associated part from the database, in tern setting the part to null in the article section
- * If the attribute destroyOnEmpty is true, it will also remove the article section if all parts are removed
- * @param nameOrId - The name or id of the article section to remove the part from
- * @param part - The part to remove from the article section cmsImage, cmsParagraph or cmsLink
- * @returns - The updated article section
- */
-export async function removeArticleSectionPart(
-    nameOrId: string | number,
-    part: ArticleSectionPart
-): Promise<ArticleSection> {
-    const where = {
-        name: typeof nameOrId === 'string' ? nameOrId : undefined,
-        id: typeof nameOrId === 'number' ? nameOrId : undefined
-    } as const satisfies Prisma.ArticleSectionWhereUniqueInput
-    const articleSection = await prismaCall(() => prisma.articleSection.findUnique({
-        where,
-        include: { cmsLink: true, cmsParagraph: true, cmsImage: true }
-    }))
-    if (!articleSection) {
-        throw new ServerError('NOT FOUND', 'ArticleSection not found')
-    }
-    if (!articleSection[part]) {
-        throw new ServerError('BAD PARAMETERS', `ArticleSection does not have ${part}`)
-    }
-
-    switch (part) {
-        case 'cmsLink':
-            if (articleSection.cmsLink) await destroyCmsLink(articleSection.cmsLink.id)
-            break
-        case 'cmsParagraph':
-            if (articleSection.cmsParagraph) await destroyCmsParagraph(articleSection.cmsParagraph.id)
-            break
-        case 'cmsImage':
-            if (articleSection.cmsImage) await destroyCmsImage(articleSection.cmsImage.id)
-            break
-        default:
-            break
-    }
-
-    // check if all Parts are removed and if so, remove the articleSection,
-    // but only if destroyOnEmpty is true
-    const afterDelete = await prisma.articleSection.findUnique({
-        where,
-        include: { cmsParagraph: true, cmsImage: true, cmsLink: true }
-    })
-    if (!afterDelete) {
-        throw new ServerError('UNKNOWN ERROR', 'Noe uventet skjedde etter sletting av del av artclesection')
-    }
-    if (
-        articleSection.destroyOnEmpty &&
-        !afterDelete.cmsImage &&
-        !afterDelete.cmsParagraph &&
-        !afterDelete.cmsImage
-    ) {
-        return await destroyArticleSection(nameOrId)
-    }
-
-    return afterDelete
-}
diff --git a/src/services/cms/articleSections/validation.ts b/src/services/cms/articleSections/validation.ts
deleted file mode 100644
index b5efbb0c5..000000000
--- a/src/services/cms/articleSections/validation.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseArticleSectionsValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-    },
-    details: {
-        name: z.string().max(20, 'Maks lengde er 20 tegn.'),
-    }
-})
-
-export const createArticleSectionValidation = baseArticleSectionsValidation.createValidation({
-    keys: ['name'],
-    transformer: data => data,
-})
-
-export type CreateArticleSectionTypes = ValidationTypes<typeof createArticleSectionValidation>
diff --git a/src/services/cms/articles/actions.ts b/src/services/cms/articles/actions.ts
deleted file mode 100644
index 33f1bb26c..000000000
--- a/src/services/cms/articles/actions.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-'use server'
-
-import { specialArticleOperations } from './operations'
-import { createZodActionError, safeServerCall } from '@/services/actionError'
-import { createArticle } from '@/services/cms/articles/create'
-import { destroyArticle } from '@/services/cms/articles/destroy'
-import { readArticle } from '@/services/cms/articles/read'
-import { addSectionToArticle, moveSectionOrder, updateArticle } from '@/services/cms/articles/update'
-import { createArticleValidation, updateArticleValidation } from '@/services/cms/articles/validation'
-import { makeAction } from '@/services/serverAction'
-import type { ExpandedArticle } from '@/cms/articles/types'
-import type { ActionReturn } from '@/services/actionTypes'
-import type { CreateArticleTypes, UpdateArticleTypes } from '@/services/cms/articles/validation'
-import type { ArticleSectionPart } from '@/cms/articleSections/types'
-import type { Article, ArticleSection } from '@prisma/client'
-
-
-export async function createArticleAction(
-    rawData: FormData | CreateArticleTypes['Type'],
-    categoryId?: number,
-): Promise<ActionReturn<ExpandedArticle>> {
-    //TODO: auth on permission or visibility to categoryId
-
-    const parse = createArticleValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createArticle(data, categoryId))
-}
-
-export async function destroyArticleAction(id: number): Promise<ActionReturn<Article>> {
-    //TODO: auth
-    return await safeServerCall(() => destroyArticle(id))
-}
-
-export async function readArticleAction(idOrName: number | {
-    name: string,
-    category: string
-}): Promise<ActionReturn<ExpandedArticle>> {
-    //TODO: auth
-    return await safeServerCall(() => readArticle(idOrName))
-}
-
-export async function updateArticleAction(
-    id: number,
-    rawData: FormData | UpdateArticleTypes['Type']
-): Promise<ActionReturn<ExpandedArticle>> {
-    //TODO: auth on visability
-    const parse = updateArticleValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => updateArticle(id, data))
-}
-
-export async function addSectionToArticleAction(
-    id: number,
-    include: Partial<Record<ArticleSectionPart, boolean>>
-): Promise<ActionReturn<ExpandedArticle>> {
-    //TODO: auth on visability
-    return await safeServerCall(() => addSectionToArticle(id, include))
-}
-
-export async function moveSectionOrderAction(
-    id: number,
-    sectionId: number,
-    direction: 'UP' | 'DOWN'
-): Promise<ActionReturn<ArticleSection>> {
-    //TODO: auth on visability
-    return await safeServerCall(() => moveSectionOrder(id, sectionId, direction))
-}
-
-export const readSpecialArticle = makeAction(specialArticleOperations.read)
diff --git a/src/services/cms/articles/ConfigVars.ts b/src/services/cms/articles/constants.ts
similarity index 95%
rename from src/services/cms/articles/ConfigVars.ts
rename to src/services/cms/articles/constants.ts
index bf91d8103..03dc6a465 100644
--- a/src/services/cms/articles/ConfigVars.ts
+++ b/src/services/cms/articles/constants.ts
@@ -1,4 +1,4 @@
-import { articleSectionsRealtionsIncluder } from '@/cms/articleSections/ConfigVars'
+import { articleSectionsRealtionsIncluder } from '@/cms/articleSections/constants'
 import type { Prisma } from '@prisma/client'
 
 export const maxSections = 10 // Max 10 sections in an article
diff --git a/src/services/cms/articles/create.ts b/src/services/cms/articles/create.ts
deleted file mode 100644
index cbb48669f..000000000
--- a/src/services/cms/articles/create.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import '@pn-server-only'
-import { articleRealtionsIncluder } from './ConfigVars'
-import { createArticleValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CreateArticleTypes } from './validation'
-import type { ExpandedArticle } from './types'
-
-/**
- * A function to create a new article. It will have no content (sections) and cover image will relate
- * to null. A category can be given to the article, but it is not required.
- * @param name - The name of the article to create. If null, a unique name will be generated.
- * @param config - { categoryId } The category to connect the article to
- * @returns - The created article with cover all contents
- */
-export async function createArticle(
-    rawData: CreateArticleTypes['Detailed'],
-    categoryId?: number,
-): Promise<ExpandedArticle> {
-    const { name } = createArticleValidation.detailedValidate(rawData)
-
-    // if name not given, create a unique new name
-    let newName = 'Ny artikkel'
-    if (!name) {
-        let i = 1
-
-        const checkArticleExists = () => prismaCall(() => prisma.article.findFirst({ where: { name: newName } }))
-
-        while (await prismaCall(checkArticleExists)) {
-            newName = `Ny artikkel ${i++}`
-        }
-    }
-    return await prismaCall(() => prisma.article.create({
-        data: {
-            name: name ?? newName,
-            coverImage: {
-                create: {},
-            },
-            articleCategory: categoryId ? {
-                connect: {
-                    id: categoryId,
-                },
-            } : undefined,
-        },
-        include: articleRealtionsIncluder,
-    }))
-}
diff --git a/src/services/cms/articles/destroy.ts b/src/services/cms/articles/destroy.ts
deleted file mode 100644
index 22fa99d6c..000000000
--- a/src/services/cms/articles/destroy.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import '@pn-server-only'
-import { destroyCmsImage } from '@/cms/images/destoy'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { Article } from '@prisma/client'
-
-/**
- * A function that destroys an article and its cover image (must be deleted to to avoid
- * orphaned cmsimages)
- * @param id - The id of the article to destroy
- * @returns
- */
-export async function destroyArticle(id: number): Promise<Article> {
-    const article = await prismaCall(() => prisma.article.delete({
-        where: { id }
-    }))
-
-    // delete coverimage to avoid orphaned cmsimages
-    await destroyCmsImage(article.coverImageId)
-
-    return article
-}
diff --git a/src/services/cms/articles/implement.ts b/src/services/cms/articles/implement.ts
new file mode 100644
index 000000000..dbdaf6160
--- /dev/null
+++ b/src/services/cms/articles/implement.ts
@@ -0,0 +1,90 @@
+import { articleOperations } from './operations'
+import { implementUpdateArticleSectionOperations } from '@/cms/articleSections/implement'
+import { cmsImageOperations } from '@/cms/images/operations'
+import type { ArgsAuthGetterAndOwnershipCheck, PrismaPossibleTransaction } from '@/services/serviceOperation'
+import type { AutherResult } from '@/auth/auther/Auther'
+import type { Prisma } from '@prisma/client'
+import type { articleSchemas } from './schemas'
+import type { z } from 'zod'
+
+type ParamsSchema = typeof articleSchemas.params
+type OwnedArticles = Prisma.ArticleGetPayload<{
+    include: {
+        coverImage: true,
+        articleSections: {
+            include: {
+                cmsImage: true,
+                cmsParagraph: true,
+                cmsLink: true,
+            }
+        }
+    }
+}>
+/**
+ * This utility implements all the needed operations for an article section and
+ * the assosiated cms: CmsLink, CmsParagraph, CmsImage
+ */
+export function implementUpdateArticleOperations<
+    const ImplementationParamsSchema extends z.ZodTypeAny
+>({
+    implementationParamsSchema,
+    authorizer,
+    ownedArticles,
+}: {
+    implementationParamsSchema: ImplementationParamsSchema,
+    authorizer: (
+        args: {
+            prisma: PrismaPossibleTransaction<false>,
+            implementationParams: z.infer<ImplementationParamsSchema>
+        }
+    ) => AutherResult | Promise<AutherResult>,
+    ownedArticles: (
+        args: {
+            prisma: PrismaPossibleTransaction<false>,
+            implementationParams: z.infer<ImplementationParamsSchema>
+        }
+    ) => Promise<OwnedArticles[]>
+}) {
+    const ownershipCheckArticle = async (
+        args: Omit<ArgsAuthGetterAndOwnershipCheck<false, ParamsSchema, undefined, ImplementationParamsSchema>, 'data'>
+    ) => {
+        const ownedArticleIds = (await ownedArticles(args)).map(article => article.id)
+        return ownedArticleIds.includes(args.params.articleId)
+    }
+
+    return {
+        update: articleOperations.update.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: ownershipCheckArticle
+        }),
+        addSection: articleOperations.addSection.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: ownershipCheckArticle
+        }),
+        reorderSections: articleOperations.reorderSections.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: ownershipCheckArticle
+        }),
+        coverImage: cmsImageOperations.update.implement({
+            implementationParamsSchema,
+            authorizer,
+            ownershipCheck: async (args) => {
+                const coverCmsImagesIds = (await ownedArticles(args)).map(article => article.coverImage.id)
+                return coverCmsImagesIds.includes(args.params.cmsImageId)
+            }
+        }),
+        articleSections: implementUpdateArticleSectionOperations({
+            implementationParamsSchema,
+            authorizer,
+            ownedArticleSections: async (args) => {
+                const ownedArticlesComputed = await ownedArticles(args)
+                const ownedArticleSections = ownedArticlesComputed.flatMap(article => article.articleSections)
+                return ownedArticleSections
+            },
+            destroyOnEmpty: true,
+        })
+    } as const
+}
diff --git a/src/services/cms/articles/operations.ts b/src/services/cms/articles/operations.ts
index 9117ab137..0a25ed6f0 100644
--- a/src/services/cms/articles/operations.ts
+++ b/src/services/cms/articles/operations.ts
@@ -1,38 +1,242 @@
 import '@pn-server-only'
-import { articleRealtionsIncluder } from './ConfigVars'
-import { defineOperation } from '@/services/serviceOperation'
-import { RequireNothing } from '@/auth/auther/RequireNothing'
+import { articleRealtionsIncluder, maxSections } from './constants'
+import { articleSchemas } from './schemas'
+import { defineOperation, defineSubOperation } from '@/services/serviceOperation'
+import { articleSectionOperations } from '@/cms/articleSections/operations'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { ServerOnly } from '@/auth/auther/ServerOnly'
+import logger from '@/lib/logger'
 import { ServerError } from '@/services/error'
 import { SpecialCmsArticle } from '@prisma/client'
 import { z } from 'zod'
-import type { ExpandedArticle } from './types'
+import { v4 } from 'uuid'
+import type { ArticleSectionPart } from '@/cms/articleSections/types'
 
-export const specialArticleOperations = {
-    read: defineOperation({
-        paramsSchema: z.object({
-            specialCmsArticle: z.nativeEnum(SpecialCmsArticle),
+const create = defineOperation({
+    authorizer: ServerOnly,
+    dataSchema: articleSchemas.create,
+    operation: async ({ prisma, data }) => {
+        let newName = 'Ny artikkel'
+        let i = 1
+        if (!data.name) {
+            const checkArticleExists = () => prisma.article.findFirst({ where: { name: newName } })
+
+            const maxIter = 30
+            while (i < maxIter && await checkArticleExists()) {
+                newName = `Ny artikkel ${i++}`
+            }
+            if (i >= maxIter) {
+                newName = v4()
+            }
+        }
+        return await prisma.article.create({
+            data: {
+                name: data.name ?? newName,
+                coverImage: {
+                    create: {},
+                }
+            },
+            include: articleRealtionsIncluder,
+        })
+    }
+})
+
+export const articleOperations = {
+    create,
+    destroy: defineOperation({
+        authorizer: ServerOnly,
+        paramsSchema: articleSchemas.params,
+        operation: async ({ prisma, params }) => {
+            const article = await prisma.article.delete({
+                where: {
+                    id: params.articleId
+                }
+            })
+            cmsImageOperations.destroy({ params: { cmsImageId: article.coverImageId }, bypassAuth: true })
+        }
+    }),
+    readSpecial: defineSubOperation({
+        paramsSchema: () => z.object({
+            special: z.nativeEnum(SpecialCmsArticle),
         }),
-        authorizer: () => RequireNothing.staticFields({}).dynamicFields({}),
-        operation: async ({ prisma, params: { specialCmsArticle } }): Promise<ExpandedArticle> => {
+        operation: () => async ({ prisma, params }) => {
             const article = await prisma.article.findUnique({
                 where: {
-                    special: specialCmsArticle,
+                    special: params.special,
                 },
                 include: articleRealtionsIncluder
-            },
-            )
-            if (!article) throw new ServerError('NOT FOUND', `Article ${specialCmsArticle} not found`)
-            if (!article.coverImage) {
-                throw new ServerError(
-                    'BAD PARAMETERS',
-                    `Article ${specialCmsArticle} has no cover image`
-                )
+            })
+            if (!article) {
+                logger.error(`Special article ${params.special} not found - creating it`)
+                return create({
+                    data: { special: params.special, name: `Regenerert spesiell ${params.special}` },
+                    bypassAuth: true
+                })
             }
-            const ret: ExpandedArticle = {
+            return {
                 ...article,
                 coverImage: article.coverImage
             }
-            return ret
+        }
+    }),
+    /**
+     * Update the article metadata like name
+     */
+    update: defineSubOperation({
+        paramsSchema: () => articleSchemas.params,
+        dataSchema: () => articleSchemas.update,
+        operation: () => async ({ prisma, params, data }) =>
+            prisma.article.update({
+                where: { id: params.articleId },
+                data,
+                include: articleRealtionsIncluder,
+            })
+    }),
+    addSection: defineSubOperation({
+        paramsSchema: () => articleSchemas.params,
+        dataSchema: () => articleSchemas.addSection,
+        operation: () => async ({ prisma, params, data }) => {
+            const article = await prisma.article.findUnique({
+                where: {
+                    id: params.articleId,
+                },
+            })
+            if (!article) throw new ServerError('NOT FOUND', 'Artikkel ikke funnet.')
+
+            const highestOrderSection = await prisma.articleSection.findMany({
+                where: {
+                    articleId: params.articleId,
+                },
+                orderBy: {
+                    order: 'desc',
+                },
+                take: 1,
+            })
+            // Get the order of the highest order section, or 0 if there are no sections
+            const nextOrder = highestOrderSection.length > 0 ? highestOrderSection[0].order + 1 : 0
+
+            const numberOfSections = await prisma.articleSection.count({
+                where: {
+                    articleId: params.articleId,
+                },
+            })
+            if (numberOfSections >= maxSections) {
+                throw new ServerError('BAD PARAMETERS', `The maximum number of sections is ${maxSections}`)
+            }
+
+            const updatedArticle = await prisma.article.update({
+                where: {
+                    id: params.articleId,
+                },
+                data: {
+                    articleSections: {
+                        create: {
+                            order: nextOrder,
+                        },
+                    },
+                },
+                include: articleRealtionsIncluder,
+            })
+
+            const addedArticleSectionId = updatedArticle.articleSections[updatedArticle.articleSections.length - 1].id
+
+            for (const part of ['cmsParagraph', 'cmsLink', 'cmsImage'] satisfies ArticleSectionPart[]) {
+                if (data.includeParts[part]) {
+                    await articleSectionOperations.addPart.internalCall({
+                        data: {
+                            part,
+                        },
+                        params: {
+                            articleSectionId: addedArticleSectionId
+                        }
+                    })
+                }
+            }
+            return updatedArticle
+        }
+    }),
+    reorderSections: defineSubOperation({
+        paramsSchema: () => articleSchemas.params.extend({
+            sectionId: z.number()
+        }),
+        opensTransaction: true,
+        dataSchema: () => articleSchemas.reorderSections,
+        operation: () => async ({ prisma, params, data }) => {
+            const section = await prisma.articleSection.findUnique({
+                where: {
+                    articleId: params.articleId,
+                    id: params.sectionId,
+                },
+            })
+            if (!section) throw new ServerError('NOT FOUND', 'Seksjon ikke funnet.')
+
+            //find the section with the order one higher/lower than the current section
+            const otherSection = await prisma.articleSection.findMany({
+                where: {
+                    articleId: params.articleId,
+                    order: data.direction === 'UP' ? {
+                        lt: section.order,
+                    } : {
+                        gt: section.order,
+                    },
+                },
+                orderBy: {
+                    order: data.direction === 'UP' ? 'desc' : 'asc',
+                },
+                take: 1,
+            }).then(
+                res => (res.length > 0 ? res[0] : null)
+            )
+            if (!otherSection) throw new ServerError('BAD PARAMETERS', 'Seksjon kan ikke flyttes opp/ned.')
+
+            //flip thir order numbers
+            const tempOrder = -1 // Or any other value that won't violate the unique constraint
+
+            // First, set the order of the section to the temporary value
+            return await prisma.$transaction(async (tx) => {
+                await tx.articleSection.update({
+                    where: {
+                        articleId: params.articleId,
+                        id: section.id
+                    },
+                    data: { order: tempOrder },
+                })
+                const updatedOtherSection = await tx.articleSection.update({
+                    where: {
+                        articleId: params.articleId,
+                        id: otherSection.id
+                    },
+                    data: { order: section.order },
+                })
+                // Finally, set the order of the section to the otherSection's original order
+                const updatedSection = await tx.articleSection.update({
+                    where: {
+                        articleId: params.articleId,
+                        id: section.id
+                    },
+                    data: { order: otherSection.order },
+                })
+
+                if (!updatedSection || !updatedOtherSection) {
+                    throw new ServerError('UNKNOWN ERROR', 'Noe uventet skjedde under flytting av seksjonen.')
+                }
+
+                return updatedSection
+            })
+        }
+    }),
+
+    read: defineSubOperation({
+        paramsSchema: () => articleSchemas.params,
+        operation: () => async ({ prisma, params }) => {
+            const article = await prisma.article.findUnique({
+                where: {
+                    id: params.articleId
+                },
+                include: articleRealtionsIncluder
+            })
+            if (!article) throw new ServerError('NOT FOUND', 'Artikkel ikke funnet.')
+            return article
         }
     })
 }
diff --git a/src/services/cms/articles/read.ts b/src/services/cms/articles/read.ts
deleted file mode 100644
index 5788f89cd..000000000
--- a/src/services/cms/articles/read.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import '@pn-server-only'
-import { articleRealtionsIncluder } from './ConfigVars'
-import { prisma } from '@/prisma/client'
-import { ServerError } from '@/services/error'
-import { prismaCall } from '@/services/prismaCall'
-import type { ExpandedArticle } from './types'
-/**
- * A function that reads an article with all the neccessary data included like paragraphs, images, etc...
- * @param idOrName - The id or name + category of the article to read
- * @returns
- */
-export async function readArticle(idOrName: number | {
-    name: string,
-    category: string
-}): Promise<ExpandedArticle> {
-    const article = await prismaCall(() => prisma.article.findUnique({
-        where: typeof idOrName === 'number' ? {
-            id: idOrName
-        } : {
-            articleCategoryName_name: {
-                articleCategoryName: idOrName.category,
-                name: idOrName.name,
-            }
-        },
-        include: articleRealtionsIncluder,
-    }))
-    if (!article) throw new ServerError('NOT FOUND', `Article ${idOrName} not found`)
-    if (!article.coverImage) throw new ServerError('BAD PARAMETERS', `Article ${idOrName} has no cover image`)
-    const ret: ExpandedArticle = {
-        ...article,
-        coverImage: article.coverImage
-    }
-    return ret
-}
diff --git a/src/services/cms/articles/schemas.ts b/src/services/cms/articles/schemas.ts
new file mode 100644
index 000000000..48028a60d
--- /dev/null
+++ b/src/services/cms/articles/schemas.ts
@@ -0,0 +1,29 @@
+import { baseSchema as baseSchemaArticleSections } from '@/cms/articleSections/schemas'
+import { SpecialCmsArticle } from '@prisma/client'
+import { z } from 'zod'
+
+const baseSchema = z.object({
+    name: z.string().min(2, 'Minimum lengde er 2 tegn.').max(20, 'Maksimum lengde er 20 tegn.'),
+    special: z.nativeEnum(SpecialCmsArticle).optional(),
+    includeParts: z.record(baseSchemaArticleSections.shape.part, z.boolean()),
+    direction: z.union([z.literal('UP'), z.literal('DOWN')])
+})
+
+export const articleSchemas = {
+    create: baseSchema.pick({
+        name: true,
+        special: true
+    }).partial(),
+    update: baseSchema.pick({
+        name: true,
+    }).partial(),
+    addSection: baseSchema.pick({
+        includeParts: true
+    }),
+    reorderSections: baseSchema.pick({
+        direction: true
+    }),
+    params: z.object({
+        articleId: z.number()
+    })
+} as const
diff --git a/src/services/cms/articles/types.ts b/src/services/cms/articles/types.ts
index 2f0c91790..467002fad 100644
--- a/src/services/cms/articles/types.ts
+++ b/src/services/cms/articles/types.ts
@@ -1,9 +1,12 @@
-import type { ExpandedArticleSection } from '@/cms/articleSections/types'
-import type { Article } from '@prisma/client'
-import type { ExpandedCmsImage } from '@/cms/images/types'
+import type { Prisma } from '@prisma/client'
+import type { articleRealtionsIncluder } from './constants'
+import type { ActionFromSubServiceOperation } from '@/services/actionTypes'
+import type { articleOperations } from './operations'
 
-export type ExpandedArticle = Article & {
-    articleSections: ExpandedArticleSection[],
-    coverImage: ExpandedCmsImage,
-}
+export type ExpandedArticle = Prisma.ArticleGetPayload<{
+    include: typeof articleRealtionsIncluder
+}>
 
+export type UpdateArticleAction = ActionFromSubServiceOperation<typeof articleOperations.update>
+export type AddSectionToArticleAction = ActionFromSubServiceOperation<typeof articleOperations.addSection>
+export type ReorderArticleSectionsAction = ActionFromSubServiceOperation<typeof articleOperations.reorderSections>
diff --git a/src/services/cms/articles/update.ts b/src/services/cms/articles/update.ts
deleted file mode 100644
index 6ad5bf086..000000000
--- a/src/services/cms/articles/update.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import '@pn-server-only'
-import { updateArticleValidation } from './validation'
-import { articleRealtionsIncluder, maxSections } from '@/cms/articles/ConfigVars'
-import { prisma } from '@/prisma/client'
-import { addArticleSectionPart } from '@/services/cms/articleSections/update'
-import { prismaCall } from '@/services/prismaCall'
-import { ServerError } from '@/services/error'
-import type { UpdateArticleTypes } from './validation'
-import type { ArticleSectionPart } from '@/cms/articleSections/types'
-import type { ArticleSection } from '@prisma/client'
-import type { ExpandedArticle } from '@/cms/articles/types'
-
-/**
- * A function to update metadata of an article. This includes for ex. name.
- * @param id - The id of the article to update
- * @param data - The new data to update the article with
- * @returns
- */
-export async function updateArticle(
-    id: number,
-    rawData: UpdateArticleTypes['Detailed'],
-): Promise<ExpandedArticle> {
-    const data = updateArticleValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.article.update({
-        where: { id },
-        data,
-        include: articleRealtionsIncluder,
-    }))
-}
-
-/**
- * A function to add a new article section to an article
- * @param id - The id of the article to add a section to
- * @param include - The parts to include in the new section
- * @returns
- */
-export async function addSectionToArticle(
-    id: number,
-    include: Partial<Record<ArticleSectionPart, boolean>>,
-): Promise<ExpandedArticle> {
-    const article = await prisma.article.findUnique({
-        where: {
-            id,
-        },
-    })
-
-    if (!article) throw new ServerError('NOT FOUND', 'Artikkel ikke funnet.')
-
-    const highestOrderSection = await prismaCall(() => prisma.articleSection.findMany({
-        where: {
-            articleId: id,
-        },
-        orderBy: {
-            order: 'desc',
-        },
-        take: 1,
-    }))
-
-    // Get the order of the highest order section, or 0 if there are no sections
-    const nextOreder = highestOrderSection.length > 0 ? highestOrderSection[0].order + 1 : 0
-
-
-    const numberOfSections = await prisma.articleSection.count({
-        where: {
-            articleId: id,
-        },
-    })
-    if (numberOfSections >= maxSections) {
-        throw new ServerError('BAD PARAMETERS', `The maximum number of sections is ${maxSections}`)
-    }
-
-    const newSectionName = `${article.name} section ${nextOreder}`
-
-    const updatedArticle = await prismaCall(() => prisma.article.update({
-        where: {
-            id,
-        },
-        data: {
-            articleSections: {
-                create: {
-                    name: newSectionName,
-                    order: nextOreder,
-                },
-            },
-        },
-        include: articleRealtionsIncluder,
-    }))
-
-    for (const part of ['cmsParagraph', 'cmsLink', 'cmsImage'] satisfies ArticleSectionPart[]) {
-        if (include[part]) {
-            await addArticleSectionPart(newSectionName, part)
-        }
-    }
-
-    return updatedArticle
-}
-
-/**
- * A function to move a section in an article up or down
- * @param id - The id of the article to move a section in
- * @param sectionId - The id of the section to move
- * @param direction - The direction to move the section in
- * @returns
- */
-export async function moveSectionOrder(
-    id: number,
-    sectionId: number,
-    direction: 'UP' | 'DOWN',
-): Promise<ArticleSection> {
-    //TODO: auth on visability
-
-    //get section to move
-    const section = await prismaCall(() => prisma.articleSection.findUnique({
-        where: {
-            articleId: id,
-            id: sectionId,
-        },
-    }))
-    if (!section) throw new ServerError('NOT FOUND', 'Seksjon ikke funnet.')
-
-    //find the section with the order one higher/lower than the current section
-    const otherSection = await prismaCall(() => prisma.articleSection.findMany({
-        where: {
-            articleId: id,
-            order: direction === 'UP' ? {
-                lt: section.order,
-            } : {
-                gt: section.order,
-            },
-        },
-        orderBy: {
-            order: direction === 'UP' ? 'desc' : 'asc',
-        },
-        take: 1,
-    }).then(sections => sections[0]))
-    if (!otherSection) throw new ServerError('BAD PARAMETERS', 'Seksjon kan ikke flyttes opp/ned.')
-
-    //flip thir order numbers
-    const tempOrder = -1 // Or any other value that won't violate the unique constraint
-
-    // First, set the order of the section to the temporary value
-    await prismaCall(() => prisma.articleSection.update({
-        where: {
-            articleId: id,
-            id: section.id
-        },
-        data: { order: tempOrder },
-    }))
-    const updatedOtherSection = await prismaCall(() => prisma.articleSection.update({
-        where: {
-            articleId: id,
-            id: otherSection.id
-        },
-        data: { order: section.order },
-    }))
-    // Finally, set the order of the section to the otherSection's original order
-    const updatedSection = await prismaCall(() => prisma.articleSection.update({
-        where: {
-            articleId: id,
-            id: section.id
-        },
-        data: { order: otherSection.order },
-    }))
-
-
-    if (!updatedSection || !updatedOtherSection) {
-        throw new ServerError('UNKNOWN ERROR', 'Noe uventet skjedde under flytting av seksjonen.')
-    }
-
-    return updatedSection
-}
diff --git a/src/services/cms/articles/validation.ts b/src/services/cms/articles/validation.ts
deleted file mode 100644
index ef664cc98..000000000
--- a/src/services/cms/articles/validation.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseArticleValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-    },
-    details: {
-        name: z.string().min(2, 'Minimum lengde er 2 tegn.').max(20, 'Maksimum lengde er 20 tegn.'),
-    }
-})
-
-export const createArticleValidation = baseArticleValidation.createValidationPartial({
-    keys: ['name'],
-    transformer: data => data
-})
-export type CreateArticleTypes = ValidationTypes<typeof createArticleValidation>
-
-export const updateArticleValidation = baseArticleValidation.createValidationPartial({
-    keys: ['name'],
-    transformer: data => data
-})
-export type UpdateArticleTypes = ValidationTypes<typeof updateArticleValidation>
diff --git a/src/services/cms/images/actions.ts b/src/services/cms/images/actions.ts
deleted file mode 100644
index 31f0c0bd4..000000000
--- a/src/services/cms/images/actions.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-'use server'
-
-import { createActionError, createZodActionError, safeServerCall } from '@/services/actionError'
-import { createCmsImage } from '@/services/cms/images/create'
-import { readCmsImage, readSpecialCmsImage } from '@/services/cms/images/read'
-import { updateCmsImage, updateCmsImageConfig } from '@/services/cms/images/update'
-import { createCmsImageActionValidation } from '@/services/cms/images/validation'
-import { SpecialCmsImage } from '@prisma/client'
-import type { CreateCmsImageActionTypes } from '@/services/cms/images/validation'
-import type { ExpandedCmsImage } from '@/cms/images/types'
-import type { ActionReturn } from '@/services/actionTypes'
-import type { CmsImage, Image, ImageSize } from '@prisma/client'
-
-export async function createCmsImageAction(
-    rawData: FormData | CreateCmsImageActionTypes['Type'],
-    image?: Image,
-): Promise<ActionReturn<ExpandedCmsImage>> {
-    //TODO: Auth route (very few people should be able to create stand alone cmsImages...)
-    const parse = createCmsImageActionValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createCmsImage(data, image))
-}
-
-/**
- * A action to read a cms image including the image associated with it
- * @param name - name of the cms image the image
- * @returns
- */
-export async function readCmsImageAction(name: string): Promise<ActionReturn<ExpandedCmsImage>> {
-    //TODO: auth on visibilty
-    return await safeServerCall(() => readCmsImage(name))
-}
-
-/**
- * Action to reads a special cmsImage, if it does not exist it creates it
- * @param special SpecialCmsImage
- * @returns ActionReturn<ExpandedCmsImage>
- */
-export async function readSpecialCmsImageAction(special: SpecialCmsImage): Promise<ActionReturn<ExpandedCmsImage>> {
-    if (!Object.values(SpecialCmsImage).includes(special)) {
-        return createActionError('BAD PARAMETERS', `${special} is not special`)
-    }
-    const specialRes = await safeServerCall(() => readSpecialCmsImage(special))
-    if (!specialRes.success) {
-        if (specialRes.errorCode === 'NOT FOUND') {
-            return await safeServerCall(() => createCmsImage({
-                name: special,
-                special,
-            }))
-        }
-        return specialRes
-    }
-    const cmsImage = specialRes.data
-    //TODO: Auth on visibilty
-    return { success: true, data: cmsImage }
-}
-
-export async function updateCmsImageAction(cmsImageId: number, imageId: number): Promise<ActionReturn<CmsImage>> {
-    //TODO: Auth on visibility (or permission if special)
-    return await safeServerCall(() => updateCmsImage(cmsImageId, imageId))
-}
-
-export async function updateCmsImageConfigAction(
-    cmsImageId: number,
-    config: {imageSize: ImageSize}
-): Promise<ActionReturn<CmsImage>> {
-    //TODO: Auth on visibility (or permission if special)
-    return await safeServerCall(() => updateCmsImageConfig(cmsImageId, config))
-}
diff --git a/src/services/cms/images/create.ts b/src/services/cms/images/create.ts
deleted file mode 100644
index d86f2cb34..000000000
--- a/src/services/cms/images/create.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import '@pn-server-only'
-import { createCmsImageValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CreateCmsImageTypes } from './validation'
-import type { Image } from '@prisma/client'
-import type { ExpandedCmsImage } from './types'
-
-/**
- * A function to create a cmsImage
- * @param name - The name of the cmsImage to create
- * @param data - The data to associate with the cmsImage
- * @param image - The image to associate with the cmsImage
- * @returns - The created cmsImage
- */
-export async function createCmsImage(
-    rawData: CreateCmsImageTypes['Detailed'],
-    image?: Image,
-): Promise<ExpandedCmsImage> {
-    const data = createCmsImageValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.cmsImage.create({
-        data: {
-            ...data,
-            image: image ? {
-                connect: {
-                    id: image?.id
-                }
-            } : undefined
-        },
-        include: {
-            image: true
-        }
-    }))
-}
diff --git a/src/services/cms/images/destoy.ts b/src/services/cms/images/destoy.ts
deleted file mode 100644
index c2fca396a..000000000
--- a/src/services/cms/images/destoy.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CmsImage } from '@prisma/client'
-
-/**
- * Destoys a cms image
- * @param id - The id of the cms image to destroy
- * @returns
- */
-export async function destroyCmsImage(id: number): Promise<CmsImage> {
-    return await prismaCall(() => prisma.cmsImage.delete({
-        where: { id },
-    }))
-}
diff --git a/src/services/cms/images/operations.ts b/src/services/cms/images/operations.ts
new file mode 100644
index 000000000..8d71183e2
--- /dev/null
+++ b/src/services/cms/images/operations.ts
@@ -0,0 +1,123 @@
+import '@pn-server-only'
+import { cmsImageSchemas } from './schemas'
+import { ServerOnly } from '@/auth/auther/ServerOnly'
+import { defineOperation, defineSubOperation } from '@/services/serviceOperation'
+import { ServerError } from '@/services/error'
+import { z } from 'zod'
+import { SpecialCmsImage } from '@prisma/client'
+
+const create = defineOperation({
+    authorizer: ServerOnly,
+    dataSchema: cmsImageSchemas.create,
+    operation: ({ prisma, data: { imageId, ...data } }) => prisma.cmsImage.create({
+        data: {
+            ...data,
+            image: imageId !== undefined ? {
+                connect: {
+                    id: imageId
+                }
+            } : undefined
+        },
+        include: {
+            image: true
+        }
+    })
+})
+
+export const cmsImageOperations = {
+    create,
+
+    readSpecial: defineSubOperation({
+        paramsSchema: () => z.object({
+            special: z.nativeEnum(SpecialCmsImage)
+        }),
+        operation: () => async ({ prisma, params }) => {
+            const image = await prisma.cmsImage.findUnique({
+                where: {
+                    special: params.special
+                },
+                include: {
+                    image: true
+                }
+            })
+            if (!image) {
+                return create({
+                    data: {
+                        name: params.special,
+                        special: params.special
+                    }
+                })
+            }
+            return image
+        }
+    }),
+
+    update: defineSubOperation({
+        paramsSchema: () => z.object({
+            cmsImageId: z.number()
+        }),
+        dataSchema: () => cmsImageSchemas.update,
+        operation: () => ({ prisma, params, data: { imageId, ...data } }) => prisma.cmsImage.update({
+            where: {
+                id: params.cmsImageId,
+            },
+            data: {
+                ...data,
+                image: imageId !== undefined ? {
+                    connect: {
+                        id: imageId
+                    }
+                } : undefined
+            },
+            include: {
+                image: true
+            }
+        })
+    }),
+
+    destroy: defineOperation({
+        authorizer: ServerOnly,
+        paramsSchema: z.object({
+            cmsImageId: z.number()
+        }),
+        operation: async ({ prisma, params }) => {
+            const cmsImage = await prisma.cmsImage.findUniqueOrThrow({
+                where: {
+                    id: params.cmsImageId
+                }
+            })
+            if (cmsImage.special) throw new ServerError('BAD PARAMETERS', 'Cannot delete special CMS image')
+            await prisma.cmsImage.delete({
+                where: {
+                    id: params.cmsImageId
+                }
+            })
+        }
+    }),
+
+    /**
+     * Check if a cms image with id is special with special atribute
+     * in the provided special array
+     * This is useful to do ownership checks for services using special cms images.
+     */
+    isSpecial: defineOperation({
+        authorizer: ServerOnly,
+        paramsSchema: z.object({
+            cmsImageId: z.number(),
+            special: z.array(z.nativeEnum(SpecialCmsImage))
+        }),
+        operation: async ({ prisma, params }) => {
+            const image = await prisma.cmsImage.findUnique({
+                where: {
+                    id: params.cmsImageId,
+                },
+                select: {
+                    special: true,
+                }
+            })
+            if (!image) throw new ServerError('NOT FOUND', 'Cms image not found')
+            if (!image?.special) return false
+            return params.special.includes(image.special)
+        }
+    })
+} as const
diff --git a/src/services/cms/images/read.ts b/src/services/cms/images/read.ts
deleted file mode 100644
index ee9f402aa..000000000
--- a/src/services/cms/images/read.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { ServerError } from '@/services/error'
-import { prismaCall } from '@/services/prismaCall'
-import type { SpecialCmsImage } from '@prisma/client'
-import type { ExpandedCmsImage } from '@/cms/images/types'
-
-/**
- * Read a cms image including the image associated with it
- * @param name - name of the cms image the image
- * @returns - The cms image
- */
-export async function readCmsImage(name: string): Promise<ExpandedCmsImage> {
-    const cmsImage = await prismaCall(() => prisma.cmsImage.findUnique({
-        where: {
-            name,
-        },
-        include: {
-            image: true,
-        }
-    }))
-    if (!cmsImage) throw new ServerError('NOT FOUND', `${name} Cms Image not found`)
-    return cmsImage
-}
-
-/**
- * WARNING: You should assure that the special atr. is Special before calling this function
- * Reads a special cmsImage.
- * @param special SpecialCmsImage
- * @returns ExpandedCmsImage
- */
-export async function readSpecialCmsImage(special: SpecialCmsImage): Promise<ExpandedCmsImage> {
-    const cmsImage = await prisma.cmsImage.findUnique({
-        where: {
-            special,
-        },
-        include: {
-            image: true,
-        }
-    })
-    if (!cmsImage) throw new ServerError('NOT FOUND', `${special} Cms Image not found`)
-    return cmsImage
-}
diff --git a/src/services/cms/images/schemas.ts b/src/services/cms/images/schemas.ts
new file mode 100644
index 000000000..51ec40f3f
--- /dev/null
+++ b/src/services/cms/images/schemas.ts
@@ -0,0 +1,22 @@
+import { ImageSize, SpecialCmsImage } from '@prisma/client'
+import { z } from 'zod'
+
+const baseSchema = z.object({
+    name: z.string().max(200, 'Maks lengde er 200 tegn.').optional(),
+    special: z.nativeEnum(SpecialCmsImage).optional(),
+    imageId: z.number().optional(),
+    imageSize: z.nativeEnum(ImageSize).optional()
+})
+
+export const cmsImageSchemas = {
+    create: baseSchema.pick({
+        name: true,
+        special: true,
+        imageId: true,
+    }),
+    update: baseSchema.pick({
+        name: true,
+        imageId: true,
+        imageSize: true
+    }).partial()
+}
diff --git a/src/services/cms/images/types.ts b/src/services/cms/images/types.ts
index ca5fcfabb..e2219bf0a 100644
--- a/src/services/cms/images/types.ts
+++ b/src/services/cms/images/types.ts
@@ -1,5 +1,10 @@
+import type { ActionFromSubServiceOperation } from '@/services/actionTypes'
+import type { cmsImageOperations } from './operations'
 import type { Image, CmsImage } from '@prisma/client'
 
 export type ExpandedCmsImage = CmsImage & {
     image: Image | null
 }
+
+export type UpdateCmsImageAction = ActionFromSubServiceOperation<typeof cmsImageOperations.update>
+export type ReadSpecialCmsImageAction = ActionFromSubServiceOperation<typeof cmsImageOperations.readSpecial>
diff --git a/src/services/cms/images/update.ts b/src/services/cms/images/update.ts
deleted file mode 100644
index 15eba1158..000000000
--- a/src/services/cms/images/update.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CmsImage, ImageSize } from '@prisma/client'
-
-/**
- * A function that changes the image of a cms image
- * @param cmImageId - The id of the cms image to change image
- * @param imageId - The id of the image to connect
- * @returns
- */
-export async function updateCmsImage(cmImageId: number, imageId: number): Promise<CmsImage> {
-    return await prismaCall(() => prisma.cmsImage.update({
-        where: {
-            id: cmImageId,
-        },
-        data: {
-            image: {
-                connect: {
-                    id: imageId,
-                }
-            }
-        }
-    }))
-}
-
-/**
- * A function to update metadata of a cms image
- * @param cmsImageId - The id of the cms image to update
- * @param config - The new config
- * @returns
- */
-export async function updateCmsImageConfig(
-    cmsImageId: number,
-    config: {imageSize: ImageSize}
-): Promise<CmsImage> {
-    return await prismaCall(() => prisma.cmsImage.update({
-        where: {
-            id: cmsImageId,
-        },
-        data: {
-            ...config
-        }
-    }))
-}
diff --git a/src/services/cms/images/validation.ts b/src/services/cms/images/validation.ts
deleted file mode 100644
index eb2ac266a..000000000
--- a/src/services/cms/images/validation.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { SpecialCmsImage } from '@prisma/client'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseCmsImageValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-        special: z.nativeEnum(SpecialCmsImage).optional(),
-    },
-    details: {
-        name: z.string().max(200, 'Maks lengde er 20 tegn.'),
-        special: z.nativeEnum(SpecialCmsImage).optional(),
-    }
-})
-
-export const createCmsImageValidation = baseCmsImageValidation.createValidation({
-    keys: ['name', 'special'],
-    transformer: data => data,
-})
-
-export type CreateCmsImageTypes = ValidationTypes<typeof createCmsImageValidation>
-
-export const createCmsImageActionValidation = baseCmsImageValidation.createValidation({
-    keys: ['name'],
-    transformer: data => data,
-})
-
-export type CreateCmsImageActionTypes = ValidationTypes<typeof createCmsImageActionValidation>
diff --git a/src/services/cms/links/actions.ts b/src/services/cms/links/actions.ts
deleted file mode 100644
index 163bfe625..000000000
--- a/src/services/cms/links/actions.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-'use server'
-
-import { makeAction } from '@/services/serverAction'
-import { createZodActionError, safeServerCall } from '@/services/actionError'
-import { createCmsLink } from '@/services/cms/links/create'
-import { readSpecialCmsLink } from '@/services/cms/links/read'
-import { updateCmsLink } from '@/services/cms/links/update'
-import { createCmsLinkValidation, updateCmsLinkValidation } from '@/services/cms/links/validation'
-import type { ActionReturn } from '@/services/actionTypes'
-import type { CreateCmsLinkTypes, UpdateCmsLinkTypes } from '@/services/cms/links/validation'
-import type { CmsLink } from '@prisma/client'
-
-export async function createCmsLinkAction(
-    rawData: FormData | CreateCmsLinkTypes['Type']
-): Promise<ActionReturn<CmsLink>> {
-    //TODO: Auth on permission to create cms
-    const parse = createCmsLinkValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createCmsLink(data))
-}
-
-export const readSpecialCmsLinkAction = makeAction(readSpecialCmsLink)
-
-export async function updateCmsLinkAction(
-    id: number,
-    rawData: FormData | UpdateCmsLinkTypes['Type']
-): Promise<ActionReturn<CmsLink>> {
-    //TODO: auth on visibility
-    const parse = updateCmsLinkValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-    if (data.url && data.url.includes('.') && !data.url.startsWith('http://') && !data.url.startsWith('https://')) {
-        data.url = `https://${data.url}`
-    }
-    return await safeServerCall(() => updateCmsLink(id, data))
-}
diff --git a/src/services/cms/links/auth.ts b/src/services/cms/links/auth.ts
deleted file mode 100644
index 7da372fc7..000000000
--- a/src/services/cms/links/auth.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { RequireNothing } from '@/auth/auther/RequireNothing'
-
-export const readSpecialCmsLinkAuth = RequireNothing.staticFields({})
diff --git a/src/services/cms/links/create.ts b/src/services/cms/links/create.ts
deleted file mode 100644
index 3ebd7c3b0..000000000
--- a/src/services/cms/links/create.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import '@pn-server-only'
-import { createCmsLinkValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CreateCmsLinkTypes } from './validation'
-import type { CmsLink } from '@prisma/client'
-
-export async function createCmsLink(rawData: CreateCmsLinkTypes['Detailed']): Promise<CmsLink> {
-    const data = createCmsLinkValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.cmsLink.create({
-        data,
-    }))
-}
diff --git a/src/services/cms/links/destroy.ts b/src/services/cms/links/destroy.ts
deleted file mode 100644
index 48946aa6d..000000000
--- a/src/services/cms/links/destroy.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CmsLink } from '@prisma/client'
-
-export async function destroyCmsLink(id: number): Promise<CmsLink> {
-    return await prismaCall(() => prisma.cmsLink.delete({
-        where: { id },
-    }))
-}
diff --git a/src/services/cms/links/operations.ts b/src/services/cms/links/operations.ts
new file mode 100644
index 000000000..1ba514b2d
--- /dev/null
+++ b/src/services/cms/links/operations.ts
@@ -0,0 +1,100 @@
+import '@pn-server-only'
+import { cmsLinkSchemas } from './schemas'
+import { ServerOnly } from '@/auth/auther/ServerOnly'
+import { defineOperation, defineSubOperation } from '@/services/serviceOperation'
+import logger from '@/lib/logger'
+import { ServerError } from '@/services/error'
+import { z } from 'zod'
+import { SpecialCmsLink } from '@prisma/client'
+
+const create = defineOperation({
+    authorizer: ServerOnly,
+    dataSchema: cmsLinkSchemas.create,
+    operation: ({ data, prisma }) =>
+        prisma.cmsLink.create({
+            data
+        })
+})
+
+export const cmsLinkOperations = {
+    create,
+
+    destroy: defineOperation({
+        authorizer: ServerOnly,
+        paramsSchema: z.object({
+            linkId: z.number()
+        }),
+        operation: async ({ params, prisma }) => {
+            const cmsLink = await prisma.cmsLink.findUniqueOrThrow({
+                where: {
+                    id: params.linkId
+                }
+            })
+            if (cmsLink.special) throw new ServerError('BAD PARAMETERS', 'Cannot delete special CMS link')
+            await prisma.cmsLink.delete({
+                where: {
+                    id: params.linkId
+                }
+            })
+        }
+    }),
+
+    update: defineSubOperation({
+        paramsSchema: () => z.object({
+            linkId: z.number()
+        }),
+        dataSchema: () => cmsLinkSchemas.update,
+        operation: () => ({ prisma, params, data }) =>
+            prisma.cmsLink.update({
+                where: {
+                    id: params.linkId
+                },
+                data: {
+                    ...data,
+                    url: data.url ?? './'
+                }
+            })
+    }),
+
+    readSpecial: defineSubOperation({
+        paramsSchema: () => z.object({
+            special: z.nativeEnum(SpecialCmsLink),
+        }),
+        operation: () => async ({ prisma, params: { special } }) => {
+            const cmsLink = await prisma.cmsLink.findUnique({
+                where: { special }
+            })
+            if (!cmsLink) {
+                logger.error(`Could not find special cms link with special ${special} - creating it!`)
+                return await create({ data: { special, url: './', text: 'Default text' } })
+            }
+            return cmsLink
+        }
+    }),
+
+    /**
+     * Check if a link with id is special with special atribute
+     * in the provided special array
+     * This is useful to do ownership checks for services using special links.
+     */
+    isSpecial: defineOperation({
+        authorizer: ServerOnly,
+        paramsSchema: z.object({
+            linkId: z.number(),
+            special: z.array(z.nativeEnum(SpecialCmsLink))
+        }),
+        operation: async ({ params, prisma }) => {
+            const link = await prisma.cmsLink.findUnique({
+                where: {
+                    id: params.linkId,
+                },
+                select: {
+                    special: true
+                }
+            })
+            if (!link) throw new ServerError('NOT FOUND', 'Link not found')
+            if (!link.special) return false
+            return params.special.includes(link.special)
+        }
+    })
+} as const
diff --git a/src/services/cms/links/read.ts b/src/services/cms/links/read.ts
deleted file mode 100644
index 0219e0edd..000000000
--- a/src/services/cms/links/read.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import '@pn-server-only'
-import { readSpecialCmsLinkAuth } from './auth'
-import logger from '@/lib/logger'
-import { defineOperation } from '@/services/serviceOperation'
-import { SpecialCmsLink } from '@prisma/client'
-import { z } from 'zod'
-
-export const readSpecialCmsLink = defineOperation({
-    paramsSchema: z.object({
-        special: z.nativeEnum(SpecialCmsLink),
-    }),
-    authorizer: () => readSpecialCmsLinkAuth.dynamicFields({}),
-    operation: async ({ prisma, params: { special } }) => {
-        const cmsLink = await prisma.cmsLink.findUnique({
-            where: { special }
-        })
-        if (!cmsLink) {
-            logger.error(`Could not find special cms link with special ${special} - creating it!`)
-            return await prisma.cmsLink.create({
-                data: { special }
-            })
-        }
-        return cmsLink
-    }
-})
diff --git a/src/services/cms/links/schemas.ts b/src/services/cms/links/schemas.ts
new file mode 100644
index 000000000..00bb1325a
--- /dev/null
+++ b/src/services/cms/links/schemas.ts
@@ -0,0 +1,37 @@
+import { SpecialCmsLink } from '@prisma/client'
+import { z } from 'zod'
+
+const cmsLinkRefiner = {
+    fcn: (url: string | undefined): boolean => {
+        if (!url) return true
+        try {
+            const urlObject = new URL(url)
+            return Boolean(urlObject)
+        } catch {
+            return url.startsWith('/') || url.includes('.')
+        }
+    },
+    message: 'Ugyldig URL.'
+}
+
+const baseSchema = z.object({
+    name: z.string().optional(),
+    text: z.string().min(1, 'Linken må ha tekst på mer enn 1 bokstav').max(30, 'Max lengde er 30'),
+    url: z.string().refine(cmsLinkRefiner.fcn, {
+        message: cmsLinkRefiner.message
+    }),
+    special: z.nativeEnum(SpecialCmsLink).optional(),
+})
+
+export const cmsLinkSchemas = {
+    create: baseSchema.pick({
+        name: true,
+        text: true,
+        url: true,
+        special: true,
+    }),
+    update: baseSchema.pick({
+        text: true,
+        url: true,
+    }).partial()
+} as const
diff --git a/src/services/cms/links/types.ts b/src/services/cms/links/types.ts
new file mode 100644
index 000000000..934754d6d
--- /dev/null
+++ b/src/services/cms/links/types.ts
@@ -0,0 +1,5 @@
+import type { cmsLinkOperations } from './operations'
+import type { ActionFromSubServiceOperation } from '@/services/actionTypes'
+
+export type UpdateCmsLinkAction = ActionFromSubServiceOperation<typeof cmsLinkOperations.update>
+
diff --git a/src/services/cms/links/update.ts b/src/services/cms/links/update.ts
deleted file mode 100644
index f49e86916..000000000
--- a/src/services/cms/links/update.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import '@pn-server-only'
-import { updateCmsLinkValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { UpdateCmsLinkTypes } from './validation'
-import type { CmsLink } from '@prisma/client'
-
-export async function updateCmsLink(
-    id: number,
-    rawData: UpdateCmsLinkTypes['Detailed'],
-): Promise<CmsLink> {
-    const data = updateCmsLinkValidation.detailedValidate(rawData)
-    data.url ??= './'
-    return await prismaCall(() => prisma.cmsLink.update({
-        where: { id },
-        data,
-    }))
-}
diff --git a/src/services/cms/links/validation.ts b/src/services/cms/links/validation.ts
deleted file mode 100644
index 4df98c36b..000000000
--- a/src/services/cms/links/validation.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseCmsLinkValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-        text: z.string(),
-        url: z.string(),
-    },
-    details: {
-        name: z.string(),
-        text: z.string().min(1, 'Linken må ha tekst på mer enn 1 bokstav').max(30, 'Max lengde er 30'),
-        url: z.string()
-    }
-})
-
-const cmsLinkRefiner = {
-    fcn: ({ url }: { url?: string }): boolean => {
-        if (!url) return true
-        try {
-            const urlObject = new URL(url)
-            return Boolean(urlObject)
-        } catch {
-            return url.startsWith('/') || url.includes('.')
-        }
-    },
-    message: 'Ugyldig URL.'
-}
-
-export const createCmsLinkValidation = baseCmsLinkValidation.createValidationPartial({
-    keys: ['name', 'text', 'url'],
-    transformer: data => data,
-    refiner: cmsLinkRefiner
-})
-
-export type CreateCmsLinkTypes = ValidationTypes<typeof createCmsLinkValidation>
-
-export const updateCmsLinkValidation = baseCmsLinkValidation.createValidationPartial({
-    keys: ['text', 'url'],
-    transformer: data => data,
-    refiner: cmsLinkRefiner
-})
-
-export type UpdateCmsLinkTypes = ValidationTypes<typeof updateCmsLinkValidation>
diff --git a/src/services/cms/paragraphs/actions.ts b/src/services/cms/paragraphs/actions.ts
deleted file mode 100644
index ab6ba0dad..000000000
--- a/src/services/cms/paragraphs/actions.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-'use server'
-
-import { createActionError, createZodActionError, safeServerCall } from '@/services/actionError'
-import { createCmsParagraph } from '@/services/cms/paragraphs/create'
-import { readCmsParagraph, readSpecialCmsParagraph } from '@/services/cms/paragraphs/read'
-import { updateCmsParagraphContents } from '@/services/cms/paragraphs/update'
-import { createCmsParagraphActionValidation } from '@/services/cms/paragraphs/validation'
-import { SpecialCmsParagraph } from '@prisma/client'
-import type { CreateCmsParagraphActionTypes } from '@/services/cms/paragraphs/validation'
-import type { ActionReturn } from '@/services/actionTypes'
-import type { CmsParagraph } from '@prisma/client'
-
-export async function createCmsParagraphAction(
-    rawData: FormData | CreateCmsParagraphActionTypes['Type']
-): Promise<ActionReturn<CmsParagraph>> {
-    //TDOD: Auth on cms permission (few should be able to create a paragraph standalone)
-    const parse = createCmsParagraphActionValidation.typeValidate(rawData)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createCmsParagraph(data))
-}
-
-export async function readCmsParagraphAction(name: string): Promise<ActionReturn<CmsParagraph>> {
-    //TODO: Auth on visibility (or permission if special)
-    return await safeServerCall(() => readCmsParagraph(name))
-}
-
-/**
- * This action reads a special paragraph from the database, if it does not exist it will create it
- * @param special - special paragraph to read
- * @returns - the paragraph
- */
-export async function readSpecialCmsParagraphAction(special: SpecialCmsParagraph): Promise<ActionReturn<CmsParagraph>> {
-    if (!Object.values(SpecialCmsParagraph).includes(special)) {
-        return createActionError('BAD PARAMETERS', `${special} is not special`)
-    }
-
-    const specialRes = await safeServerCall(() => readSpecialCmsParagraph(special))
-    if (specialRes.success) return specialRes
-    if (specialRes.errorCode === 'NOT FOUND') {
-        return await safeServerCall(() => createCmsParagraph({
-            name: special,
-            special,
-        }))
-    }
-    return specialRes
-}
-
-export async function updateCmsParagraphAction(id: number, contentMd: string): Promise<ActionReturn<CmsParagraph>> {
-    //TODO: Auth on visibility
-    return await safeServerCall(() => updateCmsParagraphContents(id, contentMd))
-}
diff --git a/src/services/cms/paragraphs/create.ts b/src/services/cms/paragraphs/create.ts
deleted file mode 100644
index 1e73944f5..000000000
--- a/src/services/cms/paragraphs/create.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import '@pn-server-only'
-import { createCmsParagraphValidation } from './validation'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CreateCmsParagraphTypes } from './validation'
-import type { CmsParagraph } from '@prisma/client'
-
-/**
- * A function to create a cms paragraph
- * @param name - name of the cms paragraph
- * @param config - Config for the paragraph, should it be special??
- * @returns
- */
-export async function createCmsParagraph(
-    rawData: CreateCmsParagraphTypes['Detailed']
-): Promise<CmsParagraph> {
-    const data = createCmsParagraphValidation.detailedValidate(rawData)
-
-    return await prismaCall(() => prisma.cmsParagraph.create({
-        data,
-    }))
-}
diff --git a/src/services/cms/paragraphs/destroy.ts b/src/services/cms/paragraphs/destroy.ts
deleted file mode 100644
index a5092b497..000000000
--- a/src/services/cms/paragraphs/destroy.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { CmsParagraph } from '@prisma/client'
-
-export async function destroyCmsParagraph(id: number): Promise<CmsParagraph> {
-    return await prismaCall(() => prisma.cmsParagraph.delete({
-        where: { id },
-    }))
-}
diff --git a/src/services/cms/paragraphs/operations.ts b/src/services/cms/paragraphs/operations.ts
index a2700c0c5..807ff4073 100644
--- a/src/services/cms/paragraphs/operations.ts
+++ b/src/services/cms/paragraphs/operations.ts
@@ -1,18 +1,117 @@
-import { defineSubOperation } from '@/services/serviceOperation'
 import '@pn-server-only'
+import { cmsParagraphSchemas } from './schemas'
+import { defineOperation, defineSubOperation } from '@/services/serviceOperation'
+import { ServerError } from '@/services/error'
+import { ServerOnly } from '@/auth/auther/ServerOnly'
 import { z } from 'zod'
+import { SpecialCmsParagraph } from '@prisma/client'
+import rehypeFormat from 'rehype-format'
+import rehypeStringify from 'rehype-stringify'
+import remarkParse from 'remark-parse'
+import remarkRehype from 'remark-rehype'
+import { unified } from 'unified'
 
-export namespace CmsParagraphMethods {
+const create = defineOperation({
+    dataSchema: cmsParagraphSchemas.create,
+    authorizer: ServerOnly,
+    operation: async ({ data, prisma }) => await prisma.cmsParagraph.create({ data })
+})
 
-    export const create = defineSubOperation({
-        paramsSchema: () => z.object({ id: z.number() }),
-        dataSchema: () => z.object({
-            title: z.string().min(2).max(100),
-            content: z.string().min(2).max(10000),
+export const cmsParagraphOperations = {
+    create,
+
+    destroy: defineOperation({
+        paramsSchema: z.object({ paragraphId: z.number() }),
+        authorizer: ServerOnly,
+        operation: async ({ params, prisma }) => {
+            const paragraph = await prisma.cmsParagraph.findUniqueOrThrow({ where: { id: params.paragraphId } })
+            if (paragraph.special) {
+                throw new ServerError('BAD PARAMETERS', 'Special paragraphs cannot be deleted')
+            }
+            await prisma.cmsParagraph.delete({ where: { id: params.paragraphId } })
+        }
+    }),
+
+    readSpecial: defineSubOperation({
+        paramsSchema: () => z.object({
+            special: z.nativeEnum(SpecialCmsParagraph)
+        }),
+        operation: () => async ({ params, prisma }) => {
+            const paragraph = await prisma.cmsParagraph.findUnique({ where: { special: params.special } })
+            if (!paragraph) {
+                return await create({ data: { special: params.special }, bypassAuth: true })
+            }
+            return paragraph
+        }
+    }),
+
+    update: defineSubOperation({
+        paramsSchema: () => z.object({
+            paragraphId: z.number(),
+        }),
+        dataSchema: () => cmsParagraphSchemas.update,
+        operation: () => async ({ params, prisma, data }) => {
+            const paragraph = await prisma.cmsParagraph.findUniqueOrThrow({ where: { id: params.paragraphId } })
+            if (paragraph.special) {
+                throw new ServerError('BAD PARAMETERS', 'Special paragraphs cannot have their meta data updated')
+            }
+            await prisma.cmsParagraph.update({ where: { id: params.paragraphId }, data })
+        }
+    }),
+
+    updateContent: defineSubOperation({
+        paramsSchema: () => z.object({
+            paragraphId: z.number(),
+        }),
+        dataSchema: () => cmsParagraphSchemas.updateContent,
+        operation: () => async ({ params, prisma, data }) => {
+            try {
+                const contentHtml = (await unified()
+                    .use(remarkParse)
+                    .use(remarkRehype)
+                    .use(rehypeFormat)
+                    .use(rehypeStringify)
+                    .process(data.markdown)).value.toString()
+                    .replace(/<img[^>]*>/g, 'Bilder i markdown er ikke støttet. Bruk det innebygde bildeverktøyet.')
+                //TODO: Final sanitization of html!!!
+                return await prisma.cmsParagraph.update({
+                    where: {
+                        id: params.paragraphId
+                    },
+                    data: {
+                        contentMd: data.markdown,
+                        contentHtml,
+                    }
+                })
+            } catch {
+                throw new ServerError('BAD PARAMETERS', 'Invalid markdown')
+            }
+        }
+    }),
+
+    /**
+     * Check if a paragraph with id is special with special atribute
+     * in the provided special array
+     * This is useful to do ownership checks for services using special paragraphs.
+     */
+    isSpecial: defineOperation({
+        authorizer: ServerOnly,
+        paramsSchema: z.object({
+            paragraphId: z.number(),
+            special: z.array(z.nativeEnum(SpecialCmsParagraph))
         }),
-        operation: () => ({ params, data, prisma }) => {
-            // Implementation for creating a CMS paragraph
-            console.log('Creating CMS paragraph with data:', { data, params, prisma })
+        operation: async ({ params, prisma }) => {
+            const paragraph = await prisma.cmsParagraph.findUnique({
+                where: {
+                    id: params.paragraphId,
+                },
+                select: {
+                    special: true
+                }
+            })
+            if (!paragraph) throw new ServerError('NOT FOUND', 'Paragraph not found')
+            if (!paragraph.special) return false
+            return params.special.includes(paragraph.special)
         }
     })
-}
+} as const
diff --git a/src/services/cms/paragraphs/read.ts b/src/services/cms/paragraphs/read.ts
deleted file mode 100644
index 07091ad91..000000000
--- a/src/services/cms/paragraphs/read.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { ServerError } from '@/services/error'
-import { prismaCall } from '@/services/prismaCall'
-import type { SpecialCmsParagraph, CmsParagraph } from '@prisma/client'
-
-export async function readCmsParagraph(name: string): Promise<CmsParagraph> {
-    const paragraph = await prismaCall(() => prisma.cmsParagraph.findUnique({
-        where: {
-            name
-        }
-    }))
-    if (!paragraph) throw new ServerError('NOT FOUND', 'CmsParagraph not found')
-    return paragraph
-}
-
-/**
- * This function reads a special paragraph from the database.
- * @param special - special paragraph to read
- * @returns - the special paragraph
- */
-export async function readSpecialCmsParagraph(special: SpecialCmsParagraph): Promise<CmsParagraph> {
-    const paragraph = await prismaCall(() => prisma.cmsParagraph.findUnique({
-        where: {
-            special
-        }
-    }))
-    if (!paragraph) throw new ServerError('NOT FOUND', 'Special CmsParagraph not found')
-    return paragraph
-}
diff --git a/src/services/cms/paragraphs/schemas.ts b/src/services/cms/paragraphs/schemas.ts
new file mode 100644
index 000000000..22ee86ba0
--- /dev/null
+++ b/src/services/cms/paragraphs/schemas.ts
@@ -0,0 +1,15 @@
+import { SpecialCmsParagraph } from '@prisma/client'
+import { z } from 'zod'
+
+
+const baseSchema = z.object({
+    name: z.string().optional(),
+    special: z.nativeEnum(SpecialCmsParagraph).optional(),
+    markdown: z.string()
+})
+
+export const cmsParagraphSchemas = {
+    create: baseSchema.pick({ name: true, special: true }),
+    update: baseSchema.pick({ name: true }).partial(),
+    updateContent: baseSchema.pick({ markdown: true })
+} as const
diff --git a/src/services/cms/paragraphs/types.ts b/src/services/cms/paragraphs/types.ts
new file mode 100644
index 000000000..30cdf6dcf
--- /dev/null
+++ b/src/services/cms/paragraphs/types.ts
@@ -0,0 +1,5 @@
+import type { cmsParagraphOperations } from './operations'
+import type { ActionFromSubServiceOperation } from '@/services/actionTypes'
+
+export type UpdateCmsParagraphAction = ActionFromSubServiceOperation<typeof cmsParagraphOperations.updateContent>
+export type ReadSpecialCmsParagraphAction = ActionFromSubServiceOperation<typeof cmsParagraphOperations.readSpecial>
diff --git a/src/services/cms/paragraphs/update.ts b/src/services/cms/paragraphs/update.ts
deleted file mode 100644
index 770288467..000000000
--- a/src/services/cms/paragraphs/update.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import '@pn-server-only'
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import { ServerError } from '@/services/error'
-import { unified } from 'unified'
-import rehypeFormat from 'rehype-format'
-import rehypeStringify from 'rehype-stringify'
-import remarkParse from 'remark-parse'
-import remarkRehype from 'remark-rehype'
-import type { CmsParagraph } from '@prisma/client'
-
-/**
- * A function to update the content of a paragraph. Takes markdown and sets both md and html content.
- * @param id - id of the paragraph to update
- * @param contentMd - new content in markdown
- * @returns
- */
-export async function updateCmsParagraphContents(id: number, contentMd: string): Promise<CmsParagraph> {
-    try {
-        const contentHtml = (await unified()
-            .use(remarkParse)
-            .use(remarkRehype)
-            .use(rehypeFormat)
-            .use(rehypeStringify)
-            .process(contentMd)).value.toString()
-            .replace(/<img[^>]*>/g, 'Bilder i markdown er ikke støttet. Bruk det innebygde bildeverktøyet.')
-        return await prismaCall(() => prisma.cmsParagraph.update({
-            where: {
-                id
-            },
-            data: {
-                contentMd,
-                contentHtml,
-            }
-        }))
-    } catch {
-        throw new ServerError('BAD PARAMETERS', 'Invalid markdown')
-    }
-}
diff --git a/src/services/cms/paragraphs/validation.ts b/src/services/cms/paragraphs/validation.ts
deleted file mode 100644
index e1bcc8c27..000000000
--- a/src/services/cms/paragraphs/validation.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { SpecialCmsParagraph } from '@prisma/client'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseCmsParagraphValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-        special: z.nativeEnum(SpecialCmsParagraph).optional(),
-    },
-    details: {
-        name: z.string(),
-        special: z.nativeEnum(SpecialCmsParagraph).optional(),
-    }
-})
-
-export const createCmsParagraphValidation = baseCmsParagraphValidation.createValidation({
-    keys: ['name', 'special'],
-    transformer: data => data
-})
-
-export type CreateCmsParagraphTypes = ValidationTypes<typeof createCmsParagraphValidation>
-
-export const createCmsParagraphActionValidation = baseCmsParagraphValidation.createValidation({
-    keys: ['name'],
-    transformer: data => data
-})
-
-export type CreateCmsParagraphActionTypes = ValidationTypes<typeof createCmsParagraphActionValidation>
diff --git a/src/services/education/schools/ConfigVars.ts b/src/services/education/schools/ConfigVars.ts
index 9bce6025d..6b9f92cec 100644
--- a/src/services/education/schools/ConfigVars.ts
+++ b/src/services/education/schools/ConfigVars.ts
@@ -5,13 +5,13 @@ import type { Prisma, School, StandardSchool } from '@prisma/client'
 export const StandardSchoolsConfig = {
     NTNU: {
         name: 'Norges tekniske og naturvitenskapelige universitet',
-        shortname: 'NTNU',
+        shortName: 'NTNU',
     }
 } as const satisfies Record<StandardSchool, CreateSchoolTypes['Detailed']>
 
 export const SchoolFieldsToExpose = [
     'name',
-    'shortname',
+    'shortName',
     'id',
     'desctiption',
 ] as const satisfies (keyof School)[]
diff --git a/src/services/education/schools/actions.ts b/src/services/education/schools/actions.ts
index 0478138ad..07cbda3f1 100644
--- a/src/services/education/schools/actions.ts
+++ b/src/services/education/schools/actions.ts
@@ -1,11 +1,12 @@
 'use server'
-
+import { schoolOperations } from './operations'
 import { createActionError, createZodActionError, safeServerCall } from '@/services/actionError'
 import { getUser } from '@/auth/session/getUser'
 import { createSchoolValidation, updateSchoolValidation } from '@/education/schools/validation'
 import { createSchool } from '@/services/education/schools/create'
 import { destroySchool } from '@/services/education/schools/destroy'
-import { readSchool, readSchools, readSchoolsPage, readStandardSchools } from '@/services/education/schools/read'
+import { makeAction } from '@/services/serverAction'
+import { readSchools, readSchoolsPage, readStandardSchools } from '@/services/education/schools/read'
 import { updateSchool } from '@/services/education/schools/update'
 import type { ReadPageInput } from '@/lib/paging/types'
 import type { CreateSchoolTypes, UpdateSchoolTypes } from '@/education/schools/validation'
@@ -69,14 +70,7 @@ export async function readSchoolsAction({
     return await safeServerCall(() => readSchools({ onlyNonStandard }))
 }
 
-export async function readSchoolAction(shortname: string): Promise<ActionReturn<ExpandedSchool>> {
-    const { authorized, status } = await getUser({
-        requiredPermissions: [['SCHOOLS_READ']]
-    })
-    if (!authorized) return createActionError(status)
-
-    return await safeServerCall(() => readSchool(shortname))
-}
+export const readSchoolAction = makeAction(schoolOperations.read)
 
 export async function updateSchoolAction(
     id: number,
@@ -93,3 +87,15 @@ export async function updateSchoolAction(
 
     return await safeServerCall(() => updateSchool(id, data))
 }
+
+export const updateSchoolCmsParagraphContentAction = makeAction(
+    schoolOperations.updateCmsParagraphContent
+)
+
+export const updateSchoolCmsImageAction = makeAction(
+    schoolOperations.updateCmsImage
+)
+
+export const updateSchoolCmsLinkAction = makeAction(
+    schoolOperations.updateCmsLink
+)
diff --git a/src/services/education/schools/auth.ts b/src/services/education/schools/auth.ts
new file mode 100644
index 000000000..03b805642
--- /dev/null
+++ b/src/services/education/schools/auth.ts
@@ -0,0 +1,8 @@
+import { RequirePermission } from '@/auth/auther/RequirePermission'
+
+export const schoolAuth = {
+    updateCmsParagraph: RequirePermission.staticFields({ permission: 'SCHOOLS_ADMIN' }),
+    read: RequirePermission.staticFields({ permission: 'SCHOOLS_READ' }),
+    updateCmsImage: RequirePermission.staticFields({ permission: 'SCHOOLS_ADMIN' }),
+    updateCmsLink: RequirePermission.staticFields({ permission: 'SCHOOLS_ADMIN' }),
+} as const
diff --git a/src/services/education/schools/create.ts b/src/services/education/schools/create.ts
index 41d9f73b3..e86ec5247 100644
--- a/src/services/education/schools/create.ts
+++ b/src/services/education/schools/create.ts
@@ -3,11 +3,10 @@ import { createSchoolValidation } from './validation'
 import { SchoolFilteredSelection, StandardSchoolsConfig } from './ConfigVars'
 import { prismaCall } from '@/services/prismaCall'
 import { ServerError } from '@/services/error'
-import { createCmsImage } from '@/services/cms/images/create'
-import { createCmsParagraph } from '@/services/cms/paragraphs/create'
 import { prisma } from '@/prisma/client'
-import { createCmsLink } from '@/services/cms/links/create'
-import { v4 as uuid } from 'uuid'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { cmsLinkOperations } from '@/cms/links/operations'
+import { cmsImageOperations } from '@/cms/images/operations'
 import { StandardSchool } from '@prisma/client'
 import type { SchoolFiltered } from './types'
 import type { CreateSchoolTypes } from './validation'
@@ -15,14 +14,20 @@ import type { CreateSchoolTypes } from './validation'
 export async function createSchool(rawdata: CreateSchoolTypes['Detailed']): Promise<SchoolFiltered> {
     const data = createSchoolValidation.detailedValidate(rawdata)
 
-    const cmsImage = await createCmsImage({ name: uuid() })
-    const cmsParagraph = await createCmsParagraph({ name: uuid() })
-    const cmsLink = await createCmsLink({ name: uuid() })
+    const cmsImage = await cmsImageOperations.create({
+        data: {},
+        bypassAuth: true
+    })
+    const cmsParagraph = await cmsParagraphOperations.create({
+        data: {},
+        bypassAuth: true
+    })
+    const cmsLink = await cmsLinkOperations.create({ data: { text: 'link', url: './' }, bypassAuth: true })
 
     return await prismaCall(() => prisma.school.create({
         data: {
             name: data.name,
-            shortname: data.shortname,
+            shortName: data.shortName,
             standardSchool: data.standardSchool,
             cmsImage: {
                 connect: {
diff --git a/src/services/education/schools/operations.ts b/src/services/education/schools/operations.ts
new file mode 100644
index 000000000..96016374f
--- /dev/null
+++ b/src/services/education/schools/operations.ts
@@ -0,0 +1,65 @@
+import '@pn-server-only'
+import { schoolAuth } from './auth'
+import { SchoolFilteredSelection, SchoolRelationIncluder } from './ConfigVars'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { defineOperation } from '@/services/serviceOperation'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { cmsLinkOperations } from '@/cms/links/operations'
+import { z } from 'zod'
+
+const read = defineOperation({
+    authorizer: () => schoolAuth.read.dynamicFields({}),
+    paramsSchema: z.object({
+        shortName: z.string()
+    }),
+    operation: ({ params, prisma }) =>
+        prisma.school.findUniqueOrThrow({
+            where: {
+                shortName: params.shortName
+            },
+            select: {
+                ...SchoolFilteredSelection,
+                ...SchoolRelationIncluder,
+            },
+        })
+})
+
+const updateCmsParagraphContent = cmsParagraphOperations.updateContent.implement({
+    authorizer: () => schoolAuth.updateCmsParagraph.dynamicFields({}),
+    implementationParamsSchema: z.object({
+        shortName: z.string()
+    }),
+    ownershipCheck: async ({ params, implementationParams }) => {
+        const school = await read({ params: implementationParams })
+        return school.cmsParagraph.id === params.paragraphId
+    }
+})
+
+const updateCmsImage = cmsImageOperations.update.implement({
+    authorizer: () => schoolAuth.updateCmsImage.dynamicFields({}),
+    implementationParamsSchema: z.object({
+        shortName: z.string()
+    }),
+    ownershipCheck: async ({ params, implementationParams }) => {
+        const school = await read({ params: implementationParams })
+        return school.cmsImage.id === params.cmsImageId
+    }
+})
+
+const updateCmsLink = cmsLinkOperations.update.implement({
+    authorizer: () => schoolAuth.updateCmsLink.dynamicFields({}),
+    implementationParamsSchema: z.object({
+        shortName: z.string()
+    }),
+    ownershipCheck: async ({ params, implementationParams }) => {
+        const school = await read({ params: implementationParams })
+        return school.cmsLink.id === params.linkId
+    }
+})
+
+export const schoolOperations = {
+    read,
+    updateCmsParagraphContent,
+    updateCmsImage,
+    updateCmsLink
+} as const
diff --git a/src/services/education/schools/read.ts b/src/services/education/schools/read.ts
index 2324a205e..6f676885c 100644
--- a/src/services/education/schools/read.ts
+++ b/src/services/education/schools/read.ts
@@ -19,7 +19,7 @@ export async function readSchoolsPage<const PageSize extends number>({
         },
         orderBy: [
             { standardSchool: 'asc' },
-            { shortname: 'asc' },
+            { shortName: 'asc' },
             { id: 'asc' },
         ],
         ...cursorPageingSelection(page),
@@ -50,15 +50,3 @@ export async function readStandardSchools(): Promise<SchoolFiltered[]> {
         return school
     }))
 }
-
-export async function readSchool(shortname: string): Promise<ExpandedSchool> {
-    return await prismaCall(() => prisma.school.findUniqueOrThrow({
-        where: {
-            shortname,
-        },
-        select: {
-            ...SchoolFilteredSelection,
-            ...SchoolRelationIncluder,
-        },
-    }))
-}
diff --git a/src/services/education/schools/validation.ts b/src/services/education/schools/validation.ts
index 79001fdde..c66847092 100644
--- a/src/services/education/schools/validation.ts
+++ b/src/services/education/schools/validation.ts
@@ -6,24 +6,24 @@ import type { ValidationTypes } from '@/services/Validation'
 const baseSchoolValidation = new ValidationBase({
     type: {
         name: z.string(),
-        shortname: z.string(),
+        shortName: z.string(),
         standardSchool: z.nativeEnum(StandardSchool).optional(),
     },
     details: {
         name: z.string().max(50).min(1).trim(),
-        shortname: z.string().max(20).min(1).trim(),
+        shortName: z.string().max(20).min(1).trim(),
         standardSchool: z.nativeEnum(StandardSchool).optional(),
     }
 })
 
 export const createSchoolValidation = baseSchoolValidation.createValidation({
-    keys: ['name', 'shortname', 'standardSchool'],
+    keys: ['name', 'shortName', 'standardSchool'],
     transformer: data => data
 })
 export type CreateSchoolTypes = ValidationTypes<typeof createSchoolValidation>
 
 export const updateSchoolValidation = baseSchoolValidation.createValidationPartial({
-    keys: ['name', 'shortname'],
+    keys: ['name', 'shortName'],
     transformer: data => data
 })
 export type UpdateSchoolTypes = ValidationTypes<typeof updateSchoolValidation>
diff --git a/src/services/events/actions.ts b/src/services/events/actions.ts
index 0ecb22161..d7e2212a0 100644
--- a/src/services/events/actions.ts
+++ b/src/services/events/actions.ts
@@ -12,3 +12,5 @@ export const readEventAction = makeAction(eventOperations.read)
 export const readArchivedEventsPageAction = makeAction(eventOperations.readManyArchivedPage)
 
 export const updateEventAction = makeAction(eventOperations.update)
+export const updateEventParagraphContentAction = makeAction(eventOperations.updateParagraphContent)
+export const updateEventCmsCoverImageAction = makeAction(eventOperations.updateCmsCoverImage)
diff --git a/src/services/events/auth.ts b/src/services/events/auth.ts
index 7f705b74e..ca7c498eb 100644
--- a/src/services/events/auth.ts
+++ b/src/services/events/auth.ts
@@ -8,5 +8,7 @@ export const eventAuth = {
     readManyCurrent: RequireNothing.staticFields({}),
     readManyArchivedPage: RequireNothing.staticFields({}),
     update: RequireNothing.staticFields({}),
+    updateCmsCoverImage: RequireNothing.staticFields({}),
     destroy: RequireNothing.staticFields({}),
+    updateParagraphContent: RequireNothing.staticFields({}),
 }
diff --git a/src/services/events/operations.ts b/src/services/events/operations.ts
index 7675b9f79..5cfc6e8a4 100644
--- a/src/services/events/operations.ts
+++ b/src/services/events/operations.ts
@@ -3,25 +3,84 @@ import { eventAuth } from './auth'
 import { eventSchemas } from './schemas'
 import { eventFilterSelection } from './constants'
 import { notificationOperations } from '@/services/notifications/operations'
-import { createCmsParagraph } from '@/services/cms/paragraphs/create'
-import { createCmsImage } from '@/services/cms/images/create'
 import { getOsloTime } from '@/lib/dates/getOsloTime'
 import { ServerError } from '@/services/error'
 import { defineOperation } from '@/services/serviceOperation'
 import { readPageInputSchemaObject } from '@/lib/paging/schema'
 import { cursorPageingSelection } from '@/lib/paging/cursorPageingSelection'
 import { displayDate } from '@/lib/dates/displayDate'
-import { v4 as uuid } from 'uuid'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
 import { z } from 'zod'
 import type { EventExpanded } from './types'
 
+const read = defineOperation({
+    paramsSchema: z.object({
+        id: z.number(),
+    }),
+    authorizer: () => eventAuth.read.dynamicFields({}),
+    operation: async ({ prisma, params, session }) => {
+        const event = await prisma.event.findUniqueOrThrow({
+            where: {
+                id: params.id,
+            },
+            include: {
+                coverImage: {
+                    include: {
+                        image: true
+                    }
+                },
+                paragraph: true,
+                eventTagEvents: {
+                    include: {
+                        tag: true
+                    }
+                },
+                _count: {
+                    select: {
+                        eventRegistrations: true,
+                    },
+                },
+                eventRegistrations: true,
+            }
+        })
+
+        let onWaitingList = false
+
+        if (!session.user) {
+            event.eventRegistrations = []
+        } else {
+            const indexOfUser = event.eventRegistrations.findIndex(reg => reg.userId === session.user.id)
+            if (indexOfUser !== -1) {
+                event.eventRegistrations = [event.eventRegistrations[indexOfUser]]
+                onWaitingList = indexOfUser >= event.places
+            } else {
+                event.eventRegistrations = []
+            }
+        }
+
+        if (onWaitingList && !event.waitingList) {
+            onWaitingList = false
+            event.eventRegistrations = []
+        }
+
+        return {
+            ...event,
+            numOfRegistrations: Math.min(event._count.eventRegistrations, event.places),
+            numOnWaitingList: Math.max(0, event._count.eventRegistrations - event.places),
+            onWaitingList,
+            tags: event.eventTagEvents.map(ete => ete.tag)
+        }
+    }
+})
+
 export const eventOperations = {
     create: defineOperation({
         dataSchema: eventSchemas.create,
         authorizer: () => eventAuth.create.dynamicFields({}),
         operation: async ({ prisma, data, session }) => {
-            const cmsParagraph = await createCmsParagraph({ name: uuid() })
-            const cmsImage = await createCmsImage({ name: uuid() })
+            const cmsParagraph = await cmsParagraphOperations.create({ data: {}, bypassAuth: true })
+            const cmsImage = await cmsImageOperations.create({ data: {}, bypassAuth: true })
 
             if (data.eventStart > data.eventEnd) {
                 throw new ServerError('BAD PARAMETERS', 'Event må jo strate før den slutter')
@@ -85,65 +144,9 @@ export const eventOperations = {
             return event
         }
     }),
-    read: defineOperation({
-        paramsSchema: z.object({
-            id: z.number(),
-        }),
-        authorizer: () => eventAuth.read.dynamicFields({}),
-        operation: async ({ prisma, params, session }) => {
-            const event = await prisma.event.findUniqueOrThrow({
-                where: {
-                    id: params.id,
-                },
-                include: {
-                    coverImage: {
-                        include: {
-                            image: true
-                        }
-                    },
-                    paragraph: true,
-                    eventTagEvents: {
-                        include: {
-                            tag: true
-                        }
-                    },
-                    _count: {
-                        select: {
-                            eventRegistrations: true,
-                        },
-                    },
-                    eventRegistrations: true,
-                }
-            })
-
-            let onWaitingList = false
 
-            if (!session.user) {
-                event.eventRegistrations = []
-            } else {
-                const indexOfUser = event.eventRegistrations.findIndex(reg => reg.userId === session.user.id)
-                if (indexOfUser !== -1) {
-                    event.eventRegistrations = [event.eventRegistrations[indexOfUser]]
-                    onWaitingList = indexOfUser >= event.places
-                } else {
-                    event.eventRegistrations = []
-                }
-            }
-
-            if (onWaitingList && !event.waitingList) {
-                onWaitingList = false
-                event.eventRegistrations = []
-            }
+    read,
 
-            return {
-                ...event,
-                numOfRegistrations: Math.min(event._count.eventRegistrations, event.places),
-                numOnWaitingList: Math.max(0, event._count.eventRegistrations - event.places),
-                onWaitingList,
-                tags: event.eventTagEvents.map(ete => ete.tag)
-            }
-        }
-    }),
     readManyCurrent: defineOperation({
         paramsSchema: z.object({
             tags: z.array(z.string()).nullable(),
@@ -278,6 +281,18 @@ export const eventOperations = {
         }
     }),
 
+    updateCmsCoverImage: cmsImageOperations.update.implement({
+        implementationParamsSchema: z.object({
+            eventId: z.number()
+        }),
+        authorizer: () => eventAuth.updateCmsCoverImage.dynamicFields({}),
+        ownershipCheck: async ({ implementationParams, params }) =>
+            (await read({
+                params: { id: implementationParams.eventId },
+                bypassAuth: true,
+            })).coverImage.id === params.cmsImageId
+    }),
+
     destroy: defineOperation({
         paramsSchema: z.object({
             id: z.number()
@@ -291,7 +306,19 @@ export const eventOperations = {
             })
         }
     }),
-}
+
+    updateParagraphContent: cmsParagraphOperations.updateContent.implement({
+        implementationParamsSchema: z.object({
+            eventId: z.number()
+        }),
+        authorizer: () => eventAuth.updateParagraphContent.dynamicFields({}),
+        ownershipCheck: async ({ implementationParams, params }) =>
+            (await read({
+                params: { id: implementationParams.eventId },
+                bypassAuth: true,
+            })).paragraph.id === params.paragraphId
+    })
+} as const
 
 function eventTagSelector(tags: string[] | null) {
     return tags ? {
diff --git a/src/services/frontpage/actions.ts b/src/services/frontpage/actions.ts
new file mode 100644
index 000000000..760a50214
--- /dev/null
+++ b/src/services/frontpage/actions.ts
@@ -0,0 +1,19 @@
+'use server'
+import { frontpageOperations } from './operations'
+import { makeAction } from '@/services/serverAction'
+
+export const readSpecialCmsParagraphFrontpageSection = makeAction(
+    frontpageOperations.readSpecialCmsParagraphFrontpageSection
+)
+
+export const updateSpecialCmsParagraphFrontpageSection = makeAction(
+    frontpageOperations.updateSpecialCmsParagraphContentFrontpageSection
+)
+
+export const readSpecialCmsImageFrontpage = makeAction(
+    frontpageOperations.readSpecialCmsImage
+)
+
+export const updateSpecialCmsImageFrontpage = makeAction(
+    frontpageOperations.updateSpecialCmsImage
+)
diff --git a/src/services/frontpage/auth.ts b/src/services/frontpage/auth.ts
new file mode 100644
index 000000000..f9ee44976
--- /dev/null
+++ b/src/services/frontpage/auth.ts
@@ -0,0 +1,10 @@
+import { RequireNothing } from '@/auth/auther/RequireNothing'
+import { RequirePermission } from '@/auth/auther/RequirePermission'
+
+
+export const frontpageAuth = {
+    readSpecialCmsParagraphFrontpageSection: RequireNothing.staticFields({}),
+    updateSpecialCmsParagraphContentFrontpageSection: RequirePermission.staticFields({ permission: 'FRONTPAGE_ADMIN' }),
+    readSpecialCmsImage: RequireNothing.staticFields({}),
+    updateSpecialCmsImage: RequirePermission.staticFields({ permission: 'FRONTPAGE_ADMIN' })
+}
diff --git a/src/services/frontpage/operations.ts b/src/services/frontpage/operations.ts
new file mode 100644
index 000000000..8793e6ef8
--- /dev/null
+++ b/src/services/frontpage/operations.ts
@@ -0,0 +1,70 @@
+import '@pn-server-only'
+import { frontpageAuth } from './auth'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { cmsImageOperations } from '@/cms/images/operations'
+import type { SpecialCmsImage, SpecialCmsParagraph } from '@prisma/client'
+
+const ownedCmsParagraphs: Readonly<SpecialCmsParagraph[]> = [
+    'FRONTPAGE_1',
+    'FRONTPAGE_2',
+    'FRONTPAGE_3',
+    'FRONTPAGE_4',
+]
+
+const ownedCmsImages: Readonly<SpecialCmsImage[]> = [
+    'FRONTPAGE_1',
+    'FRONTPAGE_2',
+    'FRONTPAGE_3',
+    'FRONTPAGE_4',
+    'FOOTER_1',
+    'FOOTER_2',
+    'FOOTER_3',
+    'FOOTER_LOGO',
+    'FRONTPAGE_LOGO',
+    'MOBILE_NAV_LOGIN_BUTTON',
+    'MOBILE_NAV_PRIMARY_BUTTON',
+    'LOADER_IMAGE',
+    'AUTH_ICON',
+    //TODO: these probably should not be read through 'frontpage'
+    //but I anyway feel like making some of the special cms images into just special images
+    'NAV_LOGIN_BUTTON',
+    'NAV_PRIMARY_BUTTON',
+    'NOT_FOUND',
+    'SERVER_ERROR'
+]
+
+export const frontpageOperations = {
+    readSpecialCmsParagraphFrontpageSection: cmsParagraphOperations.readSpecial.implement({
+        authorizer: () => frontpageAuth.readSpecialCmsParagraphFrontpageSection.dynamicFields({}),
+        ownershipCheck: ({ params }) => ownedCmsParagraphs.includes(params.special)
+    }),
+
+    updateSpecialCmsParagraphContentFrontpageSection: cmsParagraphOperations.updateContent.implement({
+        authorizer: () => frontpageAuth.updateSpecialCmsParagraphContentFrontpageSection.dynamicFields({}),
+        ownershipCheck: async ({ params }) =>
+            await cmsParagraphOperations.isSpecial({
+                params: {
+                    paragraphId: params.paragraphId,
+                    special: [...ownedCmsParagraphs],
+                },
+                bypassAuth: true
+            })
+    }),
+
+    readSpecialCmsImage: cmsImageOperations.readSpecial.implement({
+        authorizer: () => frontpageAuth.readSpecialCmsImage.dynamicFields({}),
+        ownershipCheck: ({ params }) => ownedCmsImages.includes(params.special)
+    }),
+
+    updateSpecialCmsImage: cmsImageOperations.update.implement({
+        authorizer: () => frontpageAuth.updateSpecialCmsImage.dynamicFields({}),
+        ownershipCheck: async ({ params }) =>
+            await cmsImageOperations.isSpecial({
+                params: {
+                    cmsImageId: params.cmsImageId,
+                    special: [...ownedCmsImages],
+                },
+                bypassAuth: true
+            })
+    }),
+} as const
diff --git a/src/services/groups/committees/actions.ts b/src/services/groups/committees/actions.ts
index 96b2470d2..28bd46edd 100644
--- a/src/services/groups/committees/actions.ts
+++ b/src/services/groups/committees/actions.ts
@@ -27,11 +27,46 @@ export async function createCommitteeAction(
     return await safeServerCall(() => createCommittee(parse.data))
 }
 
-export const readCommitteesAction = makeAction(committeeOperations.readCommittees)
-export const readCommitteeAction = makeAction(committeeOperations.readCommittee)
-export const readCommitteeArticleAction = makeAction(committeeOperations.readCommitteArticle)
-export const readCommitteeParagraphAction = makeAction(committeeOperations.readCommitteeParagraph)
-export const readCommitteeMembersAction = makeAction(committeeOperations.readCommitteeMembers)
+export const readAllCommitteesAction = makeAction(committeeOperations.readAll)
+export const readCommitteeAction = makeAction(committeeOperations.read)
+export const readCommitteeArticleAction = makeAction(committeeOperations.readArticle)
+
+export const readCommitteeParagraphAction = makeAction(committeeOperations.readParagraph)
+export const readCommitteeMembersAction = makeAction(committeeOperations.readMembers)
+export const updateCommitteeParagraphAction = makeAction(committeeOperations.updateParagraphContent)
+
+export const updateCommitteeLogoAction = makeAction(committeeOperations.updateLogo)
+
+export const updateCommitteeArticleAction = makeAction(
+    committeeOperations.updateArticle.update
+)
+export const updateCommitteeArticleAddSectionAction = makeAction(
+    committeeOperations.updateArticle.addSection
+)
+export const updateCommitteeArticleReorderSectionsAction = makeAction(
+    committeeOperations.updateArticle.reorderSections
+)
+export const updateCommitteeArticleCoverImageAction = makeAction(
+    committeeOperations.updateArticle.coverImage
+)
+export const updateCommitteeArticleSectionAction = makeAction(
+    committeeOperations.updateArticle.articleSections.update
+)
+export const updateCommitteeArticleSectionsAddPartAction = makeAction(
+    committeeOperations.updateArticle.articleSections.addPart
+)
+export const updateCommitteeArticleSectionsRemovePartAction = makeAction(
+    committeeOperations.updateArticle.articleSections.removePart
+)
+export const updateCommitteeArticleCmsImageAction = makeAction(
+    committeeOperations.updateArticle.articleSections.cmsImage
+)
+export const updateCommitteeArticleCmsParagraphAction = makeAction(
+    committeeOperations.updateArticle.articleSections.cmsParagraph
+)
+export const updateCommitteeArticleCmsLinkAction = makeAction(
+    committeeOperations.updateArticle.articleSections.cmsLink
+)
 
 export async function updateCommitteeAction(
     id: number,
@@ -48,3 +83,5 @@ export async function updateCommitteeAction(
 
     return await safeServerCall(() => updateCommittee(id, data))
 }
+
+export const destroyCommitteeAction = makeAction(committeeOperations.destroy)
diff --git a/src/services/groups/committees/auth.ts b/src/services/groups/committees/auth.ts
index 79566f8bf..c98cd4af5 100644
--- a/src/services/groups/committees/auth.ts
+++ b/src/services/groups/committees/auth.ts
@@ -1,5 +1,14 @@
 import { RequirePermission } from '@/auth/auther/RequirePermission'
+import { RequirePermissionOrGroupAdmin } from '@/auth/auther/RequirePermissionOrGroupAdmin'
 
 export const committeeAuth = {
+    readAll: RequirePermission.staticFields({ permission: 'COMMITTEE_READ' }),
     read: RequirePermission.staticFields({ permission: 'COMMITTEE_READ' }),
+    readMembers: RequirePermission.staticFields({ permission: 'COMMITTEE_READ' }),
+    readArticle: RequirePermission.staticFields({ permission: 'COMMITTEE_READ' }),
+    readParagraph: RequirePermission.staticFields({ permission: 'COMMITTEE_READ' }),
+    destroy: RequirePermission.staticFields({ permission: 'COMMITTEE_DESTROY' }),
+    updateParagraphContent: RequirePermissionOrGroupAdmin.staticFields({ permission: 'COMMITTEE_UPDATE' }),
+    updateLogo: RequirePermissionOrGroupAdmin.staticFields({ permission: 'COMMITTEE_UPDATE' }),
+    updateArticle: RequirePermissionOrGroupAdmin.staticFields({ permission: 'COMMITTEE_UPDATE' })
 }
diff --git a/src/services/groups/committees/create.ts b/src/services/groups/committees/create.ts
index 31273e634..631d7349e 100644
--- a/src/services/groups/committees/create.ts
+++ b/src/services/groups/committees/create.ts
@@ -1,10 +1,10 @@
 import { createCommitteeValidation } from './validation'
 import { prisma } from '@/prisma/client'
 import { prismaCall } from '@/services/prismaCall'
-import { createArticle } from '@/services/cms/articles/create'
 import { readCurrentOmegaOrder } from '@/services/omegaOrder/read'
-import { createCmsParagraph } from '@/services/cms/paragraphs/create'
 import { imageOperations } from '@/services/images/operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { articleOperations } from '@/cms/articles/operations'
 import { GroupType } from '@prisma/client'
 import type { ExpandedCommittee } from './types'
 import type { CreateCommitteeTypes } from './validation'
@@ -14,13 +14,19 @@ export async function createCommittee(rawdata: CreateCommitteeTypes['Detailed'])
     let defaultLogoImageId: number
     if (!logoImageId) {
         defaultLogoImageId = await imageOperations.readSpecial({
-            params: { special: 'DAFAULT_COMMITTEE_LOGO' }, //TODO: pass session
+            params: { special: 'DAFAULT_COMMITTEE_LOGO' },
         }).then(res => res.id)
     }
-    const article = await createArticle({})
+    const article = await articleOperations.create({ data: {}, bypassAuth: true })
 
-    const paragraph = await createCmsParagraph({ name: `Paragraph for ${name}` })
-    const applicationParagraph = await createCmsParagraph({ name: `Søknadstekst for ${name}` })
+    const paragraph = await cmsParagraphOperations.create({
+        data: { name: `Paragraph for ${name}` },
+        bypassAuth: true
+    })
+    const applicationParagraph = await cmsParagraphOperations.create({
+        data: { name: `Søknadstekst for ${name}` },
+        bypassAuth: true
+    })
 
     const order = (await readCurrentOmegaOrder()).order
 
diff --git a/src/services/groups/committees/destroy.ts b/src/services/groups/committees/destroy.ts
deleted file mode 100644
index 097254486..000000000
--- a/src/services/groups/committees/destroy.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import type { ExpandedCommittee } from './types'
-
-export async function destroyCommittee(id: number): Promise<ExpandedCommittee> {
-    return await prismaCall(() => prisma.committee.delete({
-        where: {
-            id,
-        },
-        include: {
-            logoImage: {
-                include: {
-                    image: true
-                }
-            }
-        }
-    }))
-}
diff --git a/src/services/groups/committees/operations.ts b/src/services/groups/committees/operations.ts
index 2816f70ac..34bb8a938 100644
--- a/src/services/groups/committees/operations.ts
+++ b/src/services/groups/committees/operations.ts
@@ -1,135 +1,223 @@
 import { committeeAuth } from './auth'
 import { committeeExpandedIncluder, committeeLogoIncluder, membershipIncluder } from './constants'
 import { ServerOnlyAuther } from '@/auth/auther/RequireServer'
-import { articleRealtionsIncluder } from '@/cms/articles/ConfigVars'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
 import { imageOperations } from '@/services/images/operations'
 import { defineOperation } from '@/services/serviceOperation'
+import { articleRealtionsIncluder } from '@/cms/articles/constants'
+import { implementUpdateArticleOperations } from '@/cms/articles/implement'
+import { articleOperations } from '@/cms/articles/operations'
 import { z } from 'zod'
 
-export const committeeOperations = {
 
-    readCommittees: defineOperation({
-        authorizer: () => committeeAuth.read.dynamicFields({}),
-        operation: async ({ prisma }) => prisma.committee.findMany({
-            include: committeeLogoIncluder,
-        })
-    }),
+const readAll = defineOperation({
+    authorizer: () => committeeAuth.readAll.dynamicFields({}),
+    operation: async ({ prisma }) => prisma.committee.findMany({
+        include: committeeLogoIncluder,
+    })
+})
 
-    readCommittee: defineOperation({
-        authorizer: () => committeeAuth.read.dynamicFields({}),
-        paramsSchema: z.union([
-            z.object({ id: z.number() }),
-            z.object({ shortName: z.string() })
-        ]),
-        operation: async ({ prisma, params }) => {
-            const defaultImage = await imageOperations.readSpecial({
-                params: { special: 'DEFAULT_PROFILE_IMAGE' },
-                bypassAuth: true
-            })
+const read = defineOperation({
+    authorizer: () => committeeAuth.read.dynamicFields({}),
+    paramsSchema: z.union([
+        z.object({ id: z.number() }),
+        z.object({ shortName: z.string() })
+    ]),
+    operation: async ({ prisma, params }) => {
+        const defaultImage = await imageOperations.readSpecial({
+            params: { special: 'DEFAULT_PROFILE_IMAGE' },
+            bypassAuth: true
+        })
 
-            const result = await prisma.committee.findUniqueOrThrow({
-                where: params,
-                include: committeeExpandedIncluder,
-            })
+        const result = await prisma.committee.findUniqueOrThrow({
+            where: params,
+            include: committeeExpandedIncluder,
+        })
 
-            return {
-                ...result,
-                coverImage: result.committeeArticle.coverImage,
-                group: {
-                    ...result.group,
-                    memberships: result.group.memberships.map(membership => ({
-                        ...membership,
-                        user: {
-                            ...membership.user,
-                            image: membership.user.image ?? defaultImage
-                        }
-                    }))
-                }
+        return {
+            ...result,
+            coverImage: result.committeeArticle.coverImage,
+            group: {
+                ...result.group,
+                memberships: result.group.memberships.map(membership => ({
+                    ...membership,
+                    user: {
+                        ...membership.user,
+                        image: membership.user.image ?? defaultImage
+                    }
+                }))
             }
         }
-    }),
+    }
+})
 
-    readCommitteArticle: defineOperation({
-        authorizer: () => committeeAuth.read.dynamicFields({}),
-        paramsSchema: z.object({
-            shortName: z.string(),
-        }),
-        operation: async ({ prisma, params }) => (await prisma.committee.findUniqueOrThrow({
-            where: params,
-            select: {
-                committeeArticle: {
-                    include: articleRealtionsIncluder,
-                }
+const readFromGroupIds = defineOperation({
+    authorizer: ServerOnlyAuther,
+    paramsSchema: z.object({
+        ids: z.number().int().array()
+    }),
+    operation: async ({ prisma, params }) => await prisma.committee.findMany({
+        where: {
+            groupId: {
+                in: params.ids
             }
-        })).committeeArticle
+        },
+        include: committeeLogoIncluder,
+    })
+})
+
+const readMembers = defineOperation({
+    authorizer: () => committeeAuth.readMembers.dynamicFields({}),
+    paramsSchema: z.object({
+        shortName: z.string(),
+        active: z.boolean().optional(),
     }),
+    operation: async ({ prisma, params }) => {
+        const defaultImage = await imageOperations.readSpecial({
+            params: { special: 'DEFAULT_PROFILE_IMAGE' },
+        })
 
-    readCommitteesFromGroupIds: defineOperation({
-        authorizer: ServerOnlyAuther,
-        paramsSchema: z.object({
-            ids: z.number().int().array()
-        }),
-        operation: async ({ prisma, params }) => await prisma.committee.findMany({
+        const commitee = await prisma.committee.findUniqueOrThrow({
             where: {
-                groupId: {
-                    in: params.ids
-                }
+                shortName: params.shortName
             },
-            include: committeeLogoIncluder,
+            select: {
+                group: {
+                    select: {
+                        memberships: {
+                            include: membershipIncluder,
+                            where: {
+                                active: params.active
+                            }
+                        }
+                    }
+                }
+            }
         })
-    }),
 
-    readCommitteeParagraph: defineOperation({
-        authorizer: () => committeeAuth.read.dynamicFields({}),
-        paramsSchema: z.object({
-            shortName: z.string(),
-        }),
-        operation: async ({ prisma, params }) => (await prisma.committee.findUniqueOrThrow({
-            where: params,
-            select: {
-                paragraph: true,
+        return commitee.group.memberships.map(member => ({
+            ...member,
+            user: {
+                ...member.user,
+                image: member.user.image ?? defaultImage
             }
-        })).paragraph
+        }))
+    }
+})
+
+const readArticle = defineOperation({
+    authorizer: () => committeeAuth.readArticle.dynamicFields({}),
+    paramsSchema: z.object({
+        shortName: z.string(),
     }),
+    operation: async ({ prisma, params }) => (await prisma.committee.findUniqueOrThrow({
+        where: params,
+        select: {
+            committeeArticle: {
+                include: articleRealtionsIncluder,
+            }
+        }
+    })).committeeArticle
+})
 
-    readCommitteeMembers: defineOperation({
-        authorizer: () => committeeAuth.read.dynamicFields({}),
-        paramsSchema: z.object({
-            shortName: z.string(),
-            active: z.boolean().optional(),
+const readParagraph = defineOperation({
+    authorizer: () => committeeAuth.readParagraph.dynamicFields({}),
+    paramsSchema: z.object({
+        shortName: z.string(),
+    }),
+    operation: async ({ prisma, params }) => (await prisma.committee.findUniqueOrThrow({
+        where: params,
+        select: {
+            paragraph: true,
+        }
+    })).paragraph
+})
+
+const updateParagraphContent = cmsParagraphOperations.updateContent.implement({
+    implementationParamsSchema: z.object({
+        shortName: z.string(),
+    }),
+    authorizer: async ({ implementationParams }) =>
+        committeeAuth.updateParagraphContent.dynamicFields({
+            groupId: (await read({
+                params: { shortName: implementationParams.shortName },
+                bypassAuth: true
+            })).groupId
         }),
-        operation: async ({ prisma, params }) => {
-            const defaultImage = await imageOperations.readSpecial({
-                params: { special: 'DEFAULT_PROFILE_IMAGE' },
-            })
+    ownershipCheck: async ({ implementationParams, params }) =>
+        (await readParagraph({
+            params: { shortName: implementationParams.shortName },
+            bypassAuth: true
+        })).id === params.paragraphId
+})
 
+const updateLogo = cmsImageOperations.update.implement({
+    implementationParamsSchema: z.object({
+        shortName: z.string(),
+    }),
+    authorizer: async ({ implementationParams }) =>
+        committeeAuth.updateLogo.dynamicFields({
+            groupId: (await read({
+                params: { shortName: implementationParams.shortName },
+                bypassAuth: true
+            })).groupId
+        }),
+    ownershipCheck: async ({ implementationParams, params }) => {
+        const committee = await read({
+            params: { shortName: implementationParams.shortName },
+            bypassAuth: true
+        })
+        return committee.logoImage.id === params.cmsImageId
+    }
+})
 
-            const com = await prisma.committee.findUniqueOrThrow({
-                where: {
-                    shortName: params.shortName
-                },
-                select: {
-                    group: {
-                        select: {
-                            memberships: {
-                                include: membershipIncluder,
-                                where: {
-                                    active: params.active
-                                }
-                            }
-                        }
+const destroy = defineOperation({
+    authorizer: () => committeeAuth.destroy.dynamicFields({}),
+    paramsSchema: z.object({
+        id: z.number()
+    }),
+    operation: async ({ prisma, params }) => {
+        const committee = await prisma.committee.delete({
+            where: {
+                id: params.id,
+            },
+            include: {
+                logoImage: {
+                    include: {
+                        image: true
                     }
                 }
-            })
-
+            }
+        })
+        articleOperations.destroy({ params: { articleId: committee.committeeArticleId }, bypassAuth: true })
+        return committee
+    }
+})
 
-            return com.group.memberships.map(member => ({
-                ...member,
-                user: {
-                    ...member.user,
-                    image: member.user.image ?? defaultImage
-                }
-            }))
+export const committeeOperations = {
+    readAll,
+    read,
+    readFromGroupIds,
+    readMembers,
+    readArticle,
+    readParagraph,
+    updateParagraphContent,
+    updateLogo,
+    destroy,
+    updateArticle: implementUpdateArticleOperations({
+        authorizer: async ({ implementationParams }) => committeeAuth.updateArticle.dynamicFields({
+            groupId: (await read({
+                params: { shortName: implementationParams.shortName },
+                bypassAuth: true
+            })).groupId
+        }),
+        implementationParamsSchema: z.object({
+            shortName: z.string(),
+        }),
+        ownedArticles: async ({ implementationParams }) => {
+            const article = await readArticle({ params: { shortName: implementationParams.shortName }, bypassAuth: true })
+            return [article]
         }
-    }),
+    })
 }
diff --git a/src/services/groups/committees/read.ts b/src/services/groups/committees/read.ts
deleted file mode 100644
index 0901ad3c2..000000000
--- a/src/services/groups/committees/read.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { prisma } from '@/prisma/client'
-import { prismaCall } from '@/services/prismaCall'
-import { ServerError } from '@/services/error'
-import { articleRealtionsIncluder } from '@/services/cms/articles/ConfigVars'
-import { imageOperations } from '@/services/images/operations'
-import { userFilterSelection } from '@/services/users/constants'
-import type { ExpandedArticle } from '@/cms/articles/types'
-import type { CmsParagraph } from '@prisma/client'
-import type { ExpandedCommittee, ExpandedCommitteeWithCover } from './types'
-
-export async function readCommittees(): Promise<ExpandedCommittee[]> {
-    return await prismaCall(() => prisma.committee.findMany({
-        include: {
-            logoImage: {
-                include: {
-                    image: true,
-                },
-            },
-        },
-    })
-    )
-}
-
-type ReadCommitteeArgs = {
-    id?: number,
-    shortName?: string,
-}
-
-export async function readCommittee(where: ReadCommitteeArgs): Promise<ExpandedCommitteeWithCover> {
-    if (!where) throw new ServerError('BAD PARAMETERS', 'Navn eller id må være spesifisert for å finne en komité.')
-
-    return await prismaCall(() => prisma.committee.findUniqueOrThrow({
-        where: {
-            id: where.id,
-            shortName: where.shortName,
-        },
-        include: {
-            logoImage: {
-                include: {
-                    image: true,
-                },
-            },
-            committeeArticle: {
-                include: {
-                    coverImage: {
-                        include: {
-                            image: true,
-                        },
-                    }
-                }
-            }
-        },
-    })).then(commitee => ({
-        ...commitee,
-        coverImage: commitee.committeeArticle.coverImage,
-    }))
-}
-
-export async function readCommitteeArticle(shortName: string) : Promise<ExpandedArticle> {
-    const article = await prismaCall(() => prisma.committee.findUniqueOrThrow({
-        where: { shortName },
-        select: {
-            committeeArticle: {
-                include: articleRealtionsIncluder
-            }
-        }
-    }))
-    return article.committeeArticle
-}
-
-export async function readCommitteesFromGroupIds(ids: number[]) {
-    return await prismaCall(() => prisma.committee.findMany({
-        where: {
-            groupId: {
-                in: ids
-            }
-        }
-    }))
-}
-
-export async function readCommitteeParagraph(shortName: string) : Promise<CmsParagraph> {
-    const article = await prismaCall(() => prisma.committee.findUniqueOrThrow({
-        where: { shortName },
-        select: {
-            paragraph: true
-        }
-    }))
-    return article.paragraph
-}
-
-// TODO: Create ServiceOperation
-export async function readCommitteeMembers(shortName: string) {
-    const defaultImage = await imageOperations.readSpecial({
-        params: { special: 'DEFAULT_PROFILE_IMAGE' },
-        bypassAuth: true
-    })
-
-    const com = await prismaCall(() => prisma.committee.findUniqueOrThrow({
-        where: { shortName },
-        select: {
-            group: {
-                select: {
-                    memberships: {
-                        include: {
-                            user: {
-                                select: {
-                                    ...userFilterSelection,
-                                    image: true
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }))
-    return com.group.memberships.map(member => ({
-        ...member,
-        user: {
-            ...member.user,
-            image: member.user.image ?? defaultImage
-        }
-    }))
-}
diff --git a/src/services/groups/interestGroups/actions.ts b/src/services/groups/interestGroups/actions.ts
index 3ff7cac45..18298c2df 100644
--- a/src/services/groups/interestGroups/actions.ts
+++ b/src/services/groups/interestGroups/actions.ts
@@ -4,9 +4,32 @@ import { makeAction } from '@/services/serverAction'
 import { interestGroupOperations } from '@/services/groups/interestGroups/operations'
 
 export const createInterestGroupAction = makeAction(interestGroupOperations.create)
-
 export const destroyInterestGroupAction = makeAction(interestGroupOperations.destroy)
-
 export const readInterestGroupsAction = makeAction(interestGroupOperations.readMany)
-
 export const updateInterestGroupAction = makeAction(interestGroupOperations.update)
+
+export const readSpecialCmsParagraphGeneralInfoAction = makeAction(
+    interestGroupOperations.readSpecialCmsParagraphGeneralInfo
+)
+export const updateSpecialCmsParagraphContentGeneralInfoAction = makeAction(
+    interestGroupOperations.updateSpecialCmsParagraphContentGeneralInfo
+)
+
+export const updateInterestGroupArticleSectionAction = makeAction(
+    interestGroupOperations.updateArticleSection.update
+)
+export const addPartToInterestGroupArticleSectionAction = makeAction(
+    interestGroupOperations.updateArticleSection.addPart
+)
+export const removePartFromInterestGroupArticleSectionAction = makeAction(
+    interestGroupOperations.updateArticleSection.removePart
+)
+export const updateInterestGroupCmsImageAction = makeAction(
+    interestGroupOperations.updateArticleSection.cmsImage
+)
+export const updateInterestGroupCmsParagraphAction = makeAction(
+    interestGroupOperations.updateArticleSection.cmsParagraph
+)
+export const updateInterestGroupCmsLinkAction = makeAction(
+    interestGroupOperations.updateArticleSection.cmsLink
+)
diff --git a/src/services/groups/interestGroups/auth.ts b/src/services/groups/interestGroups/auth.ts
index b61dd6cf7..84667b8a9 100644
--- a/src/services/groups/interestGroups/auth.ts
+++ b/src/services/groups/interestGroups/auth.ts
@@ -7,4 +7,7 @@ export const interestGroupAuth = {
     readMany: RequirePermission.staticFields({ permission: 'INTEREST_GROUP_READ' }),
     update: RequirePermissionOrGroupAdmin.staticFields({ permission: 'INTEREST_GROUP_ADMIN' }),
     destroy: RequirePermission.staticFields({ permission: 'INTEREST_GROUP_ADMIN' }),
+    readSpecialCmsParagraphGeneralInfo: RequirePermission.staticFields({ permission: 'INTEREST_GROUP_READ' }),
+    updateSpecialCmsParagraphContentGeneralInfo: RequirePermission.staticFields({ permission: 'INTEREST_GROUP_ADMIN' }),
+    updateArticleSection: RequirePermissionOrGroupAdmin.staticFields({ permission: 'INTEREST_GROUP_ADMIN' }),
 }
diff --git a/src/services/groups/interestGroups/operations.ts b/src/services/groups/interestGroups/operations.ts
index 3a4382efd..a1e9c8485 100644
--- a/src/services/groups/interestGroups/operations.ts
+++ b/src/services/groups/interestGroups/operations.ts
@@ -2,10 +2,11 @@ import '@pn-server-only'
 import { interestGroupAuth } from './auth'
 import { interestGroupSchemas } from './schemas'
 import { readCurrentOmegaOrder } from '@/services/omegaOrder/read'
-import { articleSectionsRealtionsIncluder } from '@/services/cms/articleSections/ConfigVars'
+import { articleSectionsRealtionsIncluder } from '@/services/cms/articleSections/constants'
 import { defineOperation } from '@/services/serviceOperation'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
+import { implementUpdateArticleSectionOperations } from '@/cms/articleSections/implement'
 import { z } from 'zod'
-import type { ExpandedInterestGroup } from './types'
 
 export const interestGroupOperations = {
     create: defineOperation({
@@ -37,7 +38,7 @@ export const interestGroupOperations = {
 
     readMany: defineOperation({
         authorizer: () => interestGroupAuth.readMany.dynamicFields({}),
-        operation: async ({ prisma }): Promise<ExpandedInterestGroup[]> => prisma.interestGroup.findMany({
+        operation: ({ prisma }) => prisma.interestGroup.findMany({
             include: {
                 articleSection: {
                     include: articleSectionsRealtionsIncluder,
@@ -107,4 +108,48 @@ export const interestGroupOperations = {
             })
         }
     }),
+
+    readSpecialCmsParagraphGeneralInfo: cmsParagraphOperations.readSpecial.implement({
+        authorizer: () => interestGroupAuth.readSpecialCmsParagraphGeneralInfo.dynamicFields({}),
+        ownershipCheck: ({ params }) => params.special === 'INTEREST_GROUP_GENERAL_INFO'
+    }),
+
+    updateSpecialCmsParagraphContentGeneralInfo: cmsParagraphOperations.updateContent.implement({
+        authorizer: () => interestGroupAuth.updateSpecialCmsParagraphContentGeneralInfo.dynamicFields({}),
+        ownershipCheck: async ({ params }) =>
+            await cmsParagraphOperations.isSpecial({
+                params: {
+                    paragraphId: params.paragraphId,
+                    special: ['INTEREST_GROUP_GENERAL_INFO']
+                }
+            })
+    }),
+    updateArticleSection: implementUpdateArticleSectionOperations({
+        implementationParamsSchema: z.object({
+            interestGroupId: z.number()
+        }),
+        authorizer: async ({ implementationParams, prisma }) => {
+            const { groupId } = await prisma.interestGroup.findUniqueOrThrow({
+                where: { id: implementationParams.interestGroupId },
+                select: { groupId: true }
+            })
+            return interestGroupAuth.updateArticleSection.dynamicFields({
+                groupId
+            })
+        },
+        ownedArticleSections: ({ prisma, implementationParams }) =>
+            prisma.interestGroup.findUniqueOrThrow({
+                where: { id: implementationParams.interestGroupId },
+                include: {
+                    articleSection: {
+                        include: {
+                            cmsImage: true,
+                            cmsParagraph: true,
+                            cmsLink: true
+                        }
+                    }
+                }
+            }).then(articleGroup => [articleGroup.articleSection]),
+        destroyOnEmpty: false,
+    }),
 }
diff --git a/src/services/news/actions.ts b/src/services/news/actions.ts
index d207b97b2..771bdcd96 100644
--- a/src/services/news/actions.ts
+++ b/src/services/news/actions.ts
@@ -1,60 +1,48 @@
 'use server'
-
-import { createActionError, createZodActionError, safeServerCall } from '@/services/actionError'
-import { createNews } from '@/services/news/create'
-import { destroyNews } from '@/services/news/destroy'
-import { readNews, readNewsCurrent, readOldNewsPage } from '@/services/news/read'
-import { updateNews } from '@/services/news/update'
-import { createNewsArticleValidation, updateNewsArticleValidation } from '@/services/news/validation'
+import { newsOperations } from './operations'
+import { createActionError } from '@/services/actionError'
 import { notificationOperations } from '@/services/notifications/operations'
-import type { CreateNewsArticleTypes, UpdateNewsArticleTypes } from '@/services/news/validation'
-import type { ExpandedNewsArticle, NewsCursor, SimpleNewsArticle } from '@/services/news/types'
-import type { ReadPageInput } from '@/lib/paging/types'
+import { makeAction } from '@/services/serverAction'
+import type { SimpleNewsArticle } from '@/services/news/types'
 import type { ActionReturn } from '@/services/actionTypes'
 
-export async function createNewsAction(
-    rawdata: FormData | CreateNewsArticleTypes['Type']
-): Promise<ActionReturn<ExpandedNewsArticle>> {
-    //TODO: check for can create news permission
-    const parse = createNewsArticleValidation.typeValidate(rawdata)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-
-    return await safeServerCall(() => createNews(data))
-}
-
-export async function destroyNewsAction(id: number): Promise<ActionReturn<Omit<SimpleNewsArticle, 'coverImage'>>> {
-    //TODO: check auth
-    return await safeServerCall(() => destroyNews(id))
-}
-
-export async function readOldNewsPageAction<const PageSize extends number>(
-    readPageImput: ReadPageInput<PageSize, NewsCursor>
-): Promise<ActionReturn<SimpleNewsArticle[]>> {
-    //TODO: only read news with right visibility
-    return await safeServerCall(() => readOldNewsPage(readPageImput))
-}
-
-export async function readNewsCurrentAction(): Promise<ActionReturn<SimpleNewsArticle[]>> {
-    //TODO: only read news with right visibility
-    return await safeServerCall(() => readNewsCurrent())
-}
-
-export async function readNewsAction(id: number): Promise<ActionReturn<ExpandedNewsArticle>> {
-    //TODO: only read news if right visibility
-    return await safeServerCall(() => readNews(id))
-}
+export const createNewsAction = makeAction(newsOperations.create)
+export const destroyNewsAction = makeAction(newsOperations.destroy)
+export const readOldNewsPageAction = makeAction(newsOperations.readOldPage)
+export const readNewsCurrentAction = makeAction(newsOperations.readCurrent)
+export const readNewsAction = makeAction(newsOperations.read)
+export const updateNewsAction = makeAction(newsOperations.update)
 
-export async function updateNewsAction(
-    id: number,
-    rawdata: FormData | UpdateNewsArticleTypes['Type']
-): Promise<ActionReturn<Omit<SimpleNewsArticle, 'coverImage'>>> {
-    //TODO: auth
-    const parse = updateNewsArticleValidation.typeValidate(rawdata)
-    if (!parse.success) return createZodActionError(parse)
-    const data = parse.data
-    return await safeServerCall(() => updateNews(id, data))
-}
+export const updateNewsArticleAction = makeAction(
+    newsOperations.updateArticle.update
+)
+export const updateNewsArticleAddSectionAction = makeAction(
+    newsOperations.updateArticle.addSection
+)
+export const updateNewsArticleReorderSectionsAction = makeAction(
+    newsOperations.updateArticle.reorderSections
+)
+export const updateNewsArticleCoverImageAction = makeAction(
+    newsOperations.updateArticle.coverImage
+)
+export const updateNewsArticleSectionAction = makeAction(
+    newsOperations.updateArticle.articleSections.update
+)
+export const updateNewsArticleSectionsAddPartAction = makeAction(
+    newsOperations.updateArticle.articleSections.addPart
+)
+export const updateNewsArticleSectionsRemovePartAction = makeAction(
+    newsOperations.updateArticle.articleSections.removePart
+)
+export const updateNewsArticleCmsImageAction = makeAction(
+    newsOperations.updateArticle.articleSections.cmsImage
+)
+export const updateNewsArticleCmsParagraphAction = makeAction(
+    newsOperations.updateArticle.articleSections.cmsParagraph
+)
+export const updateNewsArticleCmsLinkAction = makeAction(
+    newsOperations.updateArticle.articleSections.cmsLink
+)
 
 export async function publishNewsAction(
     // disable eslint rule temporarily until todo is resolved
diff --git a/src/services/news/auth.ts b/src/services/news/auth.ts
new file mode 100644
index 000000000..974b97a06
--- /dev/null
+++ b/src/services/news/auth.ts
@@ -0,0 +1,15 @@
+import { RequireNothing } from '@/auth/auther/RequireNothing'
+
+
+export const newsAuth = {
+    // Should prob. be a permission:
+    create: RequireNothing.staticFields({}),
+    // visibility 1 (admin)
+    destroy: RequireNothing.staticFields({}),
+    update: RequireNothing.staticFields({}),
+    updateArticle: RequireNothing.staticFields({}),
+    //visibility 2 (read)
+    readCurrent: RequireNothing.staticFields({}), // auth filter!!
+    readOldPage: RequireNothing.staticFields({}), // auth filter!!
+    read: RequireNothing.staticFields({}),
+} as const
diff --git a/src/services/news/ConfigVars.ts b/src/services/news/constants.ts
similarity index 89%
rename from src/services/news/ConfigVars.ts
rename to src/services/news/constants.ts
index b381a270f..c49f88a33 100644
--- a/src/services/news/ConfigVars.ts
+++ b/src/services/news/constants.ts
@@ -1,4 +1,4 @@
-import { articleRealtionsIncluder } from '@/cms/articles/ConfigVars'
+import { articleRealtionsIncluder } from '@/cms/articles/constants'
 import type { Prisma } from '@prisma/client'
 
 export const defaultNewsArticleOldCutoff = 7 // by default a newsarticle is considered old after 7 days
diff --git a/src/services/news/create.ts b/src/services/news/create.ts
deleted file mode 100644
index 81d2aea2b..000000000
--- a/src/services/news/create.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import '@pn-server-only'
-import { defaultNewsArticleOldCutoff, newsArticleRealtionsIncluder } from './ConfigVars'
-import { createNewsArticleValidation } from './validation'
-import { prismaCall } from '@/services/prismaCall'
-import { prisma } from '@/prisma/client'
-import { createArticle } from '@/services/cms/articles/create'
-import type { CreateNewsArticleTypes } from './validation'
-import type { ExpandedNewsArticle } from './types'
-
-/**
- * A function that creates a news article, it also creates a corresponding article in the CMS to
- * relate to the news article. The news will be linked to currentOmegaOrder
- * @param rawdata.endDateTime - The date and time the news article will be removed from the website.
- * endDateTime is optional, if not provided it will be set to the current date + defaultNewsArticleOldCutoff
- * @param rawdata.description - The description of the news article
- * @param rawdata.name - The name of the news article (and article)
- * @returns
- */
-export async function createNews(rawdata: CreateNewsArticleTypes['Detailed']): Promise<ExpandedNewsArticle> {
-    const { name, description, endDateTime } = createNewsArticleValidation.detailedValidate(rawdata)
-
-    const backupEndDateTime = new Date()
-    backupEndDateTime.setDate(backupEndDateTime.getDate() + defaultNewsArticleOldCutoff)
-
-    const article = await createArticle({ name })
-
-    const news = await prismaCall(() => prisma.newsArticle.create({
-        data: {
-            description,
-            article: {
-                connect: {
-                    id: article.id
-                }
-            },
-            endDateTime: endDateTime || backupEndDateTime,
-        },
-        include: newsArticleRealtionsIncluder,
-    }))
-    return news
-}
diff --git a/src/services/news/destroy.ts b/src/services/news/destroy.ts
deleted file mode 100644
index 828d22890..000000000
--- a/src/services/news/destroy.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import '@pn-server-only'
-import { prismaCall } from '@/services/prismaCall'
-import { destroyArticle } from '@/services/cms/articles/destroy'
-import { prisma } from '@/prisma/client'
-import type { SimpleNewsArticle } from '@/services/news/types'
-
-/**
- * Yhis function destroys a newsArticle. It is also responsible for sleaning up the article,
- * to avoid orphaned articles. It calls destroyArticle to destroy the article and its coverImage (cmsImage)
- * @param id - id of news article to destroy
- * @returns
- */
-export async function destroyNews(id: number): Promise<Omit<SimpleNewsArticle, 'coverImage'>> {
-    const news = await prismaCall(() => prisma.newsArticle.delete({
-        where: {
-            id
-        }
-    }))
-    await destroyArticle(news.articleId) //This function also destoys cover cms image
-    return news
-}
diff --git a/src/services/news/operations.ts b/src/services/news/operations.ts
new file mode 100644
index 000000000..43d208242
--- /dev/null
+++ b/src/services/news/operations.ts
@@ -0,0 +1,153 @@
+import '@pn-server-only'
+import { newsSchemas } from './schemas'
+import { defaultNewsArticleOldCutoff, newsArticleRealtionsIncluder, simpleNewsArticleRealtionsIncluder } from './constants'
+import { newsAuth } from './auth'
+import { articleOperations } from '@/cms/articles/operations'
+import { defineOperation } from '@/services/serviceOperation'
+import { readPageInputSchemaObject } from '@/lib/paging/schema'
+import { cursorPageingSelection } from '@/lib/paging/cursorPageingSelection'
+import { ServerError } from '@/services/error'
+import { implementUpdateArticleOperations } from '@/cms/articles/implement'
+import { z } from 'zod'
+
+const read = defineOperation({
+    authorizer: () => newsAuth.read.dynamicFields({}),
+    paramsSchema: z.object({
+        id: z.number()
+    }),
+    operation: async ({ prisma, params }) => {
+        const news = await prisma.newsArticle.findUnique({
+            where: {
+                id: params.id
+            },
+            include: newsArticleRealtionsIncluder
+        })
+        if (!news) throw new ServerError('NOT FOUND', `article ${params.id} not found`)
+        return news
+    }
+})
+
+export const newsOperations = {
+    create: defineOperation({
+        authorizer: () => newsAuth.create.dynamicFields({}),
+        dataSchema: newsSchemas.create,
+        operation: async ({ prisma, data }) => {
+            const { name, description, endDateTime } = data
+
+            const backupEndDateTime = new Date()
+            backupEndDateTime.setDate(backupEndDateTime.getDate() + defaultNewsArticleOldCutoff)
+
+            const article = await articleOperations.create({ data: { name }, bypassAuth: true })
+
+            const news = await prisma.newsArticle.create({
+                data: {
+                    description,
+                    article: {
+                        connect: {
+                            id: article.id
+                        }
+                    },
+                    endDateTime: endDateTime || backupEndDateTime,
+                },
+                include: newsArticleRealtionsIncluder,
+            })
+            return news
+        }
+    }),
+    destroy: defineOperation({
+        authorizer: () => newsAuth.destroy.dynamicFields({}),
+        paramsSchema: z.object({
+            id: z.number()
+        }),
+        operation: async ({ prisma, params }) => {
+            const news = await prisma.newsArticle.delete({
+                where: { id: params.id },
+            })
+            await articleOperations.destroy({ params: { articleId: news.articleId }, bypassAuth: true })
+        }
+    }),
+    readCurrent: defineOperation({
+        authorizer: () => newsAuth.readCurrent.dynamicFields({}),
+        operation: async ({ prisma }) => {
+            const news = await prisma.newsArticle.findMany({
+                where: {
+                    endDateTime: {
+                        gte: new Date(),
+                    }
+                },
+                orderBy: {
+                    article: {
+                        createdAt: 'desc',
+                    },
+                },
+                include: simpleNewsArticleRealtionsIncluder,
+            })
+            return news.map(newsItem => ({
+                ...newsItem,
+                coverImage: newsItem.article.coverImage.image
+            }))
+        }
+    }),
+    readOldPage: defineOperation({
+        paramsSchema: readPageInputSchemaObject(
+            z.number(),
+            z.object({
+                id: z.number(),
+            }),
+            z.undefined()
+        ), // Converted from ReadPageInput<number, EventArchiveCursor, EventArchiveDetails>
+        authorizer: () => newsAuth.readOldPage.dynamicFields({}),
+        operation: async ({ prisma, params }) => {
+            const news = await prisma.newsArticle.findMany({
+                where: {
+                    endDateTime: {
+                        lt: new Date(),
+                    }
+                },
+                ...cursorPageingSelection(params.paging.page),
+                orderBy: {
+                    article: {
+                        createdAt: 'desc',
+                    }
+                },
+                include: simpleNewsArticleRealtionsIncluder
+            })
+            return news.map(newsItem => ({
+                ...newsItem,
+                coverImage: newsItem.article.coverImage.image
+            }))
+        }
+    }),
+    read,
+    update: defineOperation({
+        authorizer: () => newsAuth.update.dynamicFields({}),
+        paramsSchema: z.object({
+            id: z.number(),
+        }),
+        dataSchema: newsSchemas.update,
+        operation: async ({ prisma, params, data }) =>
+            prisma.newsArticle.update({
+                where: { id: params.id },
+                data: {
+                    description: data.description,
+                    article: {
+                        update: {
+                            name: data.name
+                        }
+                    },
+                    endDateTime: data.endDateTime || undefined,
+                }
+            })
+    }),
+    updateArticle: implementUpdateArticleOperations({
+        implementationParamsSchema: z.object({
+            newsId: z.number(),
+        }),
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        authorizer: ({ implementationParams }) => newsAuth.updateArticle.dynamicFields({}),
+        ownedArticles: async ({ implementationParams }) => {
+            const news = await read({ params: { id: implementationParams.newsId }, bypassAuth: true })
+            return [news.article]
+        }
+    })
+} as const
diff --git a/src/services/news/read.ts b/src/services/news/read.ts
deleted file mode 100644
index d17f37268..000000000
--- a/src/services/news/read.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import '@pn-server-only'
-import { cursorPageingSelection } from '@/lib/paging/cursorPageingSelection'
-import { prismaCall } from '@/services/prismaCall'
-import { ServerError } from '@/services/error'
-import { newsArticleRealtionsIncluder, simpleNewsArticleRealtionsIncluder } from '@/services/news/ConfigVars'
-import { prisma } from '@/prisma/client'
-import type { ExpandedNewsArticle, NewsCursor, SimpleNewsArticle } from '@/services/news/types'
-import type { ReadPageInput } from '@/lib/paging/types'
-
-export async function readOldNewsPage<const PageSize extends number>(
-    { page }: ReadPageInput<PageSize, NewsCursor>
-): Promise<SimpleNewsArticle[]> {
-    const news = await prismaCall(() => prisma.newsArticle.findMany({
-        where: {
-            endDateTime: {
-                lt: new Date(),
-            }
-        },
-        ...cursorPageingSelection(page),
-        orderBy: {
-            article: {
-                createdAt: 'desc',
-            }
-        },
-        include: simpleNewsArticleRealtionsIncluder
-    }))
-    return news.map(newsItem => ({
-        ...newsItem,
-        coverImage: newsItem.article.coverImage.image
-    }))
-}
-
-export async function readNewsCurrent(): Promise<SimpleNewsArticle[]> {
-    const news = await prismaCall(() => prisma.newsArticle.findMany({
-        where: {
-            endDateTime: {
-                gte: new Date(),
-            }
-        },
-        orderBy: {
-            article: {
-                createdAt: 'desc',
-            },
-        },
-        include: simpleNewsArticleRealtionsIncluder,
-    }))
-    return news.map(newsItem => ({
-        ...newsItem,
-        coverImage: newsItem.article.coverImage.image
-    }))
-}
-
-export async function readNews(id: number): Promise<ExpandedNewsArticle> {
-    const news = await prismaCall(() => prisma.newsArticle.findUnique({
-        where: {
-            id,
-        },
-        include: newsArticleRealtionsIncluder
-    }))
-    if (!news) throw new ServerError('NOT FOUND', `article ${id} not found`)
-    return news
-}
diff --git a/src/services/news/schemas.ts b/src/services/news/schemas.ts
new file mode 100644
index 000000000..7e28cad11
--- /dev/null
+++ b/src/services/news/schemas.ts
@@ -0,0 +1,21 @@
+import { Zpn } from '@/lib/fields/zpn'
+import { z } from 'zod'
+
+const baseSchema = z.object({
+    name: z.string().max(25, 'max lengde 25').min(2, 'min lengde 2'),
+    description: z.string().max(200, 'max lengde 200').min(2, 'min lengde 2').or(z.literal('')),
+    endDateTime: Zpn.date({ label: 'Avsluttning' }).optional()
+})
+
+export const newsSchemas = {
+    create: baseSchema.pick({
+        name: true,
+        description: true,
+        endDateTime: true
+    }),
+    update: baseSchema.pick({
+        name: true,
+        description: true,
+        endDateTime: true
+    }).partial()
+} as const
diff --git a/src/services/news/types.ts b/src/services/news/types.ts
index 6541c26fc..eb73639cb 100644
--- a/src/services/news/types.ts
+++ b/src/services/news/types.ts
@@ -1,9 +1,9 @@
-import type { ExpandedArticle } from '@/cms/articles/types'
-import type { NewsArticle, Image } from '@prisma/client'
+import type { newsArticleRealtionsIncluder } from './constants'
+import type { NewsArticle, Image, Prisma } from '@prisma/client'
 
-export type ExpandedNewsArticle = NewsArticle & {
-    article: ExpandedArticle
-}
+export type ExpandedNewsArticle = Prisma.NewsArticleGetPayload<{
+    include: typeof newsArticleRealtionsIncluder
+}>
 
 //used for read many actions
 export type SimpleNewsArticle = NewsArticle & {
diff --git a/src/services/news/update.ts b/src/services/news/update.ts
deleted file mode 100644
index e1664c160..000000000
--- a/src/services/news/update.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import '@pn-server-only'
-import { updateNewsArticleValidation } from './validation'
-import { prismaCall } from '@/services/prismaCall'
-import { prisma } from '@/prisma/client'
-import type { UpdateNewsArticleTypes } from './validation'
-import type { SimpleNewsArticle } from '@/services/news/types'
-
-export async function updateNews(
-    id: number,
-    rawdata: UpdateNewsArticleTypes['Detailed']
-): Promise<Omit<SimpleNewsArticle, 'coverImage'>> {
-    const data = updateNewsArticleValidation.detailedValidate(rawdata)
-    return await prismaCall(() => prisma.newsArticle.update({
-        where: { id },
-        data: {
-            description: data.description,
-            article: {
-                update: {
-                    name: data.name
-                }
-            },
-            endDateTime: data.endDateTime || undefined,
-        }
-    }))
-}
diff --git a/src/services/news/validation.ts b/src/services/news/validation.ts
deleted file mode 100644
index 9e793622e..000000000
--- a/src/services/news/validation.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { ValidationBase } from '@/services/Validation'
-import { z } from 'zod'
-import type { ValidationTypes } from '@/services/Validation'
-
-export const baseNewsArticleValidation = new ValidationBase({
-    type: {
-        name: z.string(),
-        description: z.string().or(z.literal('')),
-        endDateTime: z.string().optional(),
-    },
-    details: {
-        name: z.string().max(25, 'max lengde 25').min(2, 'min lengde 2'),
-        description: z.string().max(200, 'max lengde 200').min(2, 'min lengde 2').or(z.literal('')),
-        endDateTime: z.date().optional()
-    }
-})
-const dateTransformer = (data: string | undefined) => (data ? new Date(data) : undefined)
-
-export const createNewsArticleValidation = baseNewsArticleValidation.createValidation({
-    keys: [
-        'name',
-        'description',
-        'endDateTime'
-    ],
-    transformer: data => ({
-        ...data,
-        endDateTime: dateTransformer(data.endDateTime)
-    })
-})
-export type CreateNewsArticleTypes = ValidationTypes<typeof createNewsArticleValidation>
-
-export const updateNewsArticleValidation = baseNewsArticleValidation.createValidation({
-    keys: [
-        'name',
-        'description',
-        'endDateTime'
-    ],
-    transformer: data => ({
-        ...data,
-        endDateTime: dateTransformer(data.endDateTime)
-    })
-})
-export type UpdateNewsArticleTypes = ValidationTypes<typeof updateNewsArticleValidation>
diff --git a/src/services/ombul/actions.ts b/src/services/ombul/actions.ts
index 2aeabf900..8761cdedf 100644
--- a/src/services/ombul/actions.ts
+++ b/src/services/ombul/actions.ts
@@ -1,10 +1,11 @@
 'use server'
 
+import { ombulOperations } from './operations'
+import { makeAction } from '@/services/serverAction'
 import { createActionError, createZodActionError, safeServerCall } from '@/services/actionError'
 import { getUser } from '@/auth/session/getUser'
 import { createOmbul } from '@/services/ombul/create'
 import { destroyOmbul } from '@/services/ombul/destroy'
-import { readLatestOmbul, readOmbul, readOmbuls } from '@/services/ombul/read'
 import { updateOmbul, updateOmbulFile } from '@/services/ombul/update'
 import { createOmbulValidation, updateOmbulFileValidation, updateOmbulValidation } from '@/services/ombul/validation'
 import type { ExpandedOmbul } from '@/services/ombul/types'
@@ -41,39 +42,11 @@ export async function destroyOmbulAction(id: number): Promise<ActionReturn<Expan
     return await safeServerCall(() => destroyOmbul(id))
 }
 
-export async function readLatestOmbulAction(): Promise<ActionReturn<Ombul>> {
-    //Auth route
-    const { status, authorized } = await getUser({
-        requiredPermissions: [['OMBUL_READ']]
-    })
-    if (!authorized) return createActionError(status)
+export const readOmbulAction = makeAction(ombulOperations.read)
+export const readLatestOmbulAction = makeAction(ombulOperations.readLatest)
+export const readOmbulsAction = makeAction(ombulOperations.readAll)
 
-    return await safeServerCall(() => readLatestOmbul())
-}
-
-export async function readOmbulAction(idOrNameAndYear: number | {
-    name: string,
-    year: number,
-}): Promise<ActionReturn<ExpandedOmbul>> {
-    //Auth route
-    const { status, authorized } = await getUser({
-        requiredPermissions: [['OMBUL_READ']]
-    })
-    if (!authorized) return createActionError(status)
-
-    return await safeServerCall(() => readOmbul(idOrNameAndYear))
-}
-
-export async function readOmbulsAction(): Promise<ActionReturn<ExpandedOmbul[]>> {
-    //Auth route
-    const { status, authorized } = await getUser({
-        requiredPermissions: [['OMBUL_READ']]
-    })
-    if (!authorized) {
-        return createActionError(status)
-    }
-    return await safeServerCall(() => readOmbuls())
-}
+export const updateOmbulCmsCoverImageAction = makeAction(ombulOperations.updateCmsCoverImage)
 
 /**
  * A action to update an ombul
diff --git a/src/services/ombul/auth.ts b/src/services/ombul/auth.ts
new file mode 100644
index 000000000..13b0c7a4e
--- /dev/null
+++ b/src/services/ombul/auth.ts
@@ -0,0 +1,8 @@
+import { RequirePermission } from '@/auth/auther/RequirePermission'
+
+export const ombulAuth = {
+    read: RequirePermission.staticFields({ permission: 'OMBUL_READ' }),
+    readAll: RequirePermission.staticFields({ permission: 'OMBUL_READ' }),
+    readLatest: RequirePermission.staticFields({ permission: 'OMBUL_READ' }),
+    updateCmsCoverImage: RequirePermission.staticFields({ permission: 'OMBUL_UPDATE' })
+} as const
diff --git a/src/services/ombul/create.ts b/src/services/ombul/create.ts
index 032334307..ee36c09a6 100644
--- a/src/services/ombul/create.ts
+++ b/src/services/ombul/create.ts
@@ -2,7 +2,7 @@ import '@pn-server-only'
 import { createOmbulValidation } from './validation'
 import { prismaCall } from '@/services/prismaCall'
 import { readSpecialImageCollection } from '@/services/images/collections/read'
-import { createCmsImage } from '@/services/cms/images/create'
+import { cmsImageOperations } from '@/cms/images/operations'
 import { prisma } from '@/prisma/client'
 import { createFile } from '@/services/store/createFile'
 import { imageOperations } from '@/services/images/operations'
@@ -42,7 +42,6 @@ export async function createOmbul(
 
     // create coverimage
     const ombulCoverCollection = await readSpecialImageCollection('OMBULCOVERS')
-
     const coverImage = await imageOperations.create({
         params: {
             collectionId: ombulCoverCollection.id,
@@ -54,7 +53,10 @@ export async function createOmbul(
         },
     })
 
-    const cmsCoverImage = await createCmsImage({ name: fsLocation }, coverImage)
+    const cmsCoverImage = await cmsImageOperations.create({
+        data: { imageId: coverImage.id },
+        bypassAuth: true
+    })
 
     const ombul = await prismaCall(() => prisma.ombul.create({
         data: {
diff --git a/src/services/ombul/operations.ts b/src/services/ombul/operations.ts
new file mode 100644
index 000000000..d856b8c4d
--- /dev/null
+++ b/src/services/ombul/operations.ts
@@ -0,0 +1,89 @@
+import '@pn-server-only'
+import { ombulAuth } from './auth'
+import { defineOperation } from '@/services/serviceOperation'
+import { cmsImageOperations } from '@/cms/images/operations'
+import { z } from 'zod'
+
+const read = defineOperation({
+    authorizer: () => ombulAuth.read.dynamicFields({}),
+    paramsSchema: z.union([
+        z.object({
+            id: z.number(),
+            name: z.undefined().optional(),
+            year: z.undefined().optional()
+        }),
+        z.object({
+            id: z.undefined().optional(),
+            name: z.string(),
+            year: z.number()
+        })
+    ]),
+    operation: ({ params, prisma }) =>
+        prisma.ombul.findUniqueOrThrow({
+            where: typeof params.id === 'number' ? {
+                id: params.id
+            } : {
+                year_name: {
+                    name: params.name,
+                    year: params.year
+                }
+            },
+            include: {
+                coverImage: {
+                    include: {
+                        image: true
+                    }
+                }
+            }
+        })
+})
+
+const readAll = defineOperation({
+    authorizer: () => ombulAuth.readAll.dynamicFields({}),
+    operation: ({ prisma }) =>
+        prisma.ombul.findMany({
+            orderBy: [
+                { year: 'desc' },
+                { issueNumber: 'desc' },
+            ],
+            include: {
+                coverImage: {
+                    include: {
+                        image: true
+                    }
+                }
+            }
+        })
+})
+
+const readLatest = defineOperation({
+    authorizer: () => ombulAuth.readLatest.dynamicFields({}),
+    operation: async ({ prisma }) => {
+        const ombul = await prisma.ombul.findMany({
+            orderBy: [
+                { year: 'desc' },
+                { issueNumber: 'desc' },
+            ],
+            take: 1,
+        })
+        return ombul[0]
+    }
+})
+
+const updateCmsCoverImage = cmsImageOperations.update.implement({
+    implementationParamsSchema: z.object({
+        ombulId: z.number()
+    }),
+    authorizer: () => ombulAuth.updateCmsCoverImage.dynamicFields({}),
+    ownershipCheck: async ({ params, implementationParams }) => {
+        const ombul = await read({ params: { id: implementationParams.ombulId } })
+        return ombul.coverImage.id === params.cmsImageId
+    }
+})
+
+export const ombulOperations = {
+    read,
+    readAll,
+    readLatest,
+    updateCmsCoverImage
+} as const
diff --git a/src/services/ombul/read.ts b/src/services/ombul/read.ts
deleted file mode 100644
index d4edeb582..000000000
--- a/src/services/ombul/read.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import '@pn-server-only'
-import { ServerError } from '@/services/error'
-import { prismaCall } from '@/services/prismaCall'
-import { prisma } from '@/prisma/client'
-import type { Ombul } from '@prisma/client'
-import type { ExpandedOmbul } from './types'
-
-export async function readLatestOmbul(): Promise<Ombul> {
-    const ombul = await prisma.ombul.findMany({
-        orderBy: [
-            { year: 'desc' },
-            { issueNumber: 'desc' },
-        ],
-        take: 1,
-    })
-    if (!ombul) throw new ServerError('NOT FOUND', 'Fant ingen ombul.')
-    return ombul[0]
-}
-
-/**
- * A function to read one ombul
- * @param idOrNameAndYear - The id of the ombul to read, or an object with the name and year of the ombul to read
- * @returns
- */
-export async function readOmbul(idOrNameAndYear: number | {
-    name: string,
-    year: number,
-}): Promise<ExpandedOmbul> {
-    const ombul = await prismaCall(() => prisma.ombul.findUnique({
-        where: typeof idOrNameAndYear === 'number' ? {
-            id: idOrNameAndYear
-        } : {
-            year_name: {
-                name: idOrNameAndYear.name,
-                year: idOrNameAndYear.year
-            }
-        },
-        include: {
-            coverImage: {
-                include: {
-                    image: true
-                }
-            }
-        }
-    }))
-    if (!ombul) throw new ServerError('NOT FOUND', 'Fant ingen ombul')
-
-    return ombul
-}
-
-/**
- * A function to read all ombuls, orders by year and issue number
- * @returns - All ombuls
- */
-export async function readOmbuls(): Promise<ExpandedOmbul[]> {
-    return await prismaCall(() => prisma.ombul.findMany({
-        orderBy: [
-            { year: 'desc' },
-            { issueNumber: 'desc' },
-        ],
-        include: {
-            coverImage: {
-                include: {
-                    image: true
-                }
-            }
-        }
-    }))
-}
diff --git a/src/services/permissions/constants.ts b/src/services/permissions/constants.ts
index 0c8de89ee..51abb9070 100644
--- a/src/services/permissions/constants.ts
+++ b/src/services/permissions/constants.ts
@@ -7,7 +7,6 @@ export const permissionCategories = [
     'groups',
     'jobad',
     'diverse admin',
-    'cms',
     'brukere',
     'bilder',
     'events',
@@ -18,6 +17,7 @@ export const permissionCategories = [
     'cabin',
     'permission',
     'applications',
+    'public'
 ] as const satisfies string[]
 
 export const permissionConfig = {
@@ -176,10 +176,15 @@ export const permissionConfig = {
         description: 'kan lese omega',
         category: 'diverse admin',
     },
-    CMS_ADMIN: {
-        name: 'CMS administrator',
-        description: 'kan administrere CMS',
-        category: 'cms',
+    FRONTPAGE_ADMIN: {
+        name: 'Frontpage administrator',
+        description: 'kan administrere frontpage',
+        category: 'public',
+    },
+    PUBLIC_ARTICLE_ADMIN: {
+        name: 'Administrere offentlige artikler',
+        description: 'kan administrere offentlige artikler',
+        category: 'public',
     },
     USERS_CREATE: {
         name: 'Lage bruker',
@@ -203,8 +208,8 @@ export const permissionConfig = {
     },
     USERS_CONNECT_STUDENT_CARD: {
         name: 'Koble studentkort til andre brukere',
-        // eslint-disable-next-line max-len
-        description: 'Kan legge til andre personer i registreringskøen for å registrere et kort og kan registrere et kort på en person',
+        description: `Kan legge til andre personer i registreringskøen for å 
+        registrere et kort og kan registrere et kort på en person`,
         category: 'brukere'
     },
     IMAGE_ADMIN: {
diff --git a/src/services/prismaCall.ts b/src/services/prismaCall.ts
index 17ae5f086..864ddd36e 100644
--- a/src/services/prismaCall.ts
+++ b/src/services/prismaCall.ts
@@ -40,10 +40,14 @@ export async function prismaCall<T>(call: () => T | Promise<T>): Promise<T> {
     }
 }
 
-//TODO: Remove prismaCall and use prismaErrorWrapper instead
+//TODO: Remove prismaCall and use prismaErrorWrapper instead - this is handled implicitly through
+// the use of operations
+
 /**
  * A function that wraps a prisma call in a try catch block and throws a ServerError if it fails.
- *
+ * It translates prisma errors into ServerErrors.
+ * Further unknown errors are thrown as UNKNOWN ServerErrors.
+ * When wrapped in this you make sure all thrown errors are of type ServerError
  * @param call - The function to be wrapped
  * @returns
  */
diff --git a/src/services/publicArticles/actions.ts b/src/services/publicArticles/actions.ts
new file mode 100644
index 000000000..b7a4bea4b
--- /dev/null
+++ b/src/services/publicArticles/actions.ts
@@ -0,0 +1,38 @@
+'use server'
+import { publicArticleOperations } from './operations'
+import { makeAction } from '@/services/serverAction'
+
+export const readPublicArticle = makeAction(
+    publicArticleOperations.read
+)
+
+export const updatePublicArticleAction = makeAction(
+    publicArticleOperations.update.update
+)
+export const updatePublicArticleAddSectionAction = makeAction(
+    publicArticleOperations.update.addSection
+)
+export const updatePublicArticleReorderSectionsAction = makeAction(
+    publicArticleOperations.update.reorderSections
+)
+export const updatePublicArticleCoverImageAction = makeAction(
+    publicArticleOperations.update.coverImage
+)
+export const updatePublicArticleSectionAction = makeAction(
+    publicArticleOperations.update.articleSections.update
+)
+export const updatePublicArticleSectionsAddPartAction = makeAction(
+    publicArticleOperations.update.articleSections.addPart
+)
+export const updatePublicArticleSectionsRemovePartAction = makeAction(
+    publicArticleOperations.update.articleSections.removePart
+)
+export const updatePublicArticleCmsImageAction = makeAction(
+    publicArticleOperations.update.articleSections.cmsImage
+)
+export const updatePublicArticleCmsParagraphAction = makeAction(
+    publicArticleOperations.update.articleSections.cmsParagraph
+)
+export const updatePublicArticleCmsLinkAction = makeAction(
+    publicArticleOperations.update.articleSections.cmsLink
+)
diff --git a/src/services/publicArticles/auth.ts b/src/services/publicArticles/auth.ts
new file mode 100644
index 000000000..19cc92c03
--- /dev/null
+++ b/src/services/publicArticles/auth.ts
@@ -0,0 +1,7 @@
+import { RequireNothing } from '@/auth/auther/RequireNothing'
+import { RequirePermission } from '@/auth/auther/RequirePermission'
+
+export const publicArticleAuth = {
+    read: RequireNothing.staticFields({}),
+    update: RequirePermission.staticFields({ permission: 'PUBLIC_ARTICLE_ADMIN' })
+} as const
diff --git a/src/services/publicArticles/operations.ts b/src/services/publicArticles/operations.ts
new file mode 100644
index 000000000..1427300ac
--- /dev/null
+++ b/src/services/publicArticles/operations.ts
@@ -0,0 +1,39 @@
+import '@pn-server-only'
+import { publicArticleAuth } from './auth'
+import { articleOperations } from '@/services/cms/articles/operations'
+import { implementUpdateArticleOperations } from '@/cms/articles/implement'
+import { z } from 'zod'
+import type { SpecialCmsArticle } from '@prisma/client'
+
+const publicSpecialArticles: SpecialCmsArticle[] = [
+    'NEW_STUDENT_PAGE', 'REPORT_PAGE'
+]
+
+export const publicArticleOperations = {
+    read: articleOperations.readSpecial.implement({
+        authorizer: () => publicArticleAuth.read.dynamicFields({}),
+        ownershipCheck: ({ params }) => publicSpecialArticles.includes(params.special)
+    }),
+    update: implementUpdateArticleOperations({
+        authorizer: () => publicArticleAuth.update.dynamicFields({}),
+        implementationParamsSchema: z.undefined(),
+        ownedArticles: async ({ prisma }) =>
+            await prisma.article.findMany({
+                where: {
+                    special: {
+                        in: publicSpecialArticles
+                    }
+                },
+                include: {
+                    coverImage: true,
+                    articleSections: {
+                        include: {
+                            cmsImage: true,
+                            cmsLink: true,
+                            cmsParagraph: true
+                        }
+                    }
+                }
+            })
+    })
+} as const
diff --git a/src/services/screens/pages/create.ts b/src/services/screens/pages/create.ts
index 53f31a6a6..1f2cacd64 100644
--- a/src/services/screens/pages/create.ts
+++ b/src/services/screens/pages/create.ts
@@ -2,15 +2,14 @@ import '@pn-server-only'
 import { type CreatePageTypes, createPageValidation } from './validation'
 import { prismaCall } from '@/services/prismaCall'
 import { prisma } from '@/prisma/client'
-import { createCmsImage } from '@/services/cms/images/create'
-import { createCmsParagraph } from '@/services/cms/paragraphs/create'
-import { v4 } from 'uuid'
+import { cmsImageOperations } from '@/services/cms/images/operations'
+import { cmsParagraphOperations } from '@/cms/paragraphs/operations'
 import type { ScreenPage } from '@prisma/client'
 
 export async function createPage(rawdata: CreatePageTypes['Detailed']): Promise<ScreenPage> {
     const { name } = createPageValidation.detailedValidate(rawdata)
-    const cmsImage = await createCmsImage({ name: v4() })
-    const cmsParagraph = await createCmsParagraph({ name: v4() })
+    const cmsImage = await cmsImageOperations.create({ data: {}, bypassAuth: true })
+    const cmsParagraph = await cmsParagraphOperations.create({ data: {}, bypassAuth: true })
 
     return await prismaCall(() => prisma.screenPage.create({
         data: {
diff --git a/src/services/serverAction.ts b/src/services/serverAction.ts
index bb65b6100..836809a25 100644
--- a/src/services/serverAction.ts
+++ b/src/services/serverAction.ts
@@ -1,53 +1,46 @@
 import '@pn-server-only'
 import { safeServerCall } from './actionError'
 import { Session } from '@/auth/session/Session'
-import type { ActionReturn } from './actionTypes'
+import type { Action, ActionReturn } from './actionTypes'
 import type { ServiceOperation } from '@/services/serviceOperation'
 import type { z } from 'zod'
 
 // This function is overloaded to allow for different combinations of parameters and data.
 
-export function makeAction<Return>(
+export function makeAction<
+    Return,
+>(
     serviceOperation: ServiceOperation<boolean, Return, undefined, undefined, undefined>
-): () => Promise<ActionReturn<Return>>
+): Action<Return, undefined, undefined, undefined>
 
 export function makeAction<
     Return,
-    ImplementationParamsSchema extends z.ZodTypeAny
+    ImplementationParamsSchema extends z.ZodTypeAny,
 >(
     serviceOperation: ServiceOperation<boolean, Return, undefined, undefined, ImplementationParamsSchema>
-): (
-    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
-) => Promise<ActionReturn<Return>>
+): Action<Return, ImplementationParamsSchema, undefined, undefined>
 
 export function makeAction<
     Return,
-    ParamsSchema extends z.ZodTypeAny
+    ParamsSchema extends z.ZodTypeAny,
 >(
     serviceOperation: ServiceOperation<boolean, Return, ParamsSchema, undefined, undefined>
-): (
-    params: { params: z.input<ParamsSchema> },
-) => Promise<ActionReturn<Return>>
+): Action<Return, undefined, ParamsSchema, undefined>
 
 export function makeAction<
     Return,
     DataSchema extends z.ZodTypeAny
 >(
     serviceOperation: ServiceOperation<boolean, Return, undefined, DataSchema, undefined>
-): (
-    data: { data: z.input<DataSchema> } | FormData
-) => Promise<ActionReturn<Return>>
+): Action<Return, undefined, undefined, DataSchema>
 
 export function makeAction<
     Return,
+    ImplementationParamsSchema extends z.ZodTypeAny,
     ParamsSchema extends z.ZodTypeAny,
-    ImplementationParamsSchema extends z.ZodTypeAny
 >(
     serviceOperation: ServiceOperation<boolean, Return, ParamsSchema, undefined, ImplementationParamsSchema>
-): (
-    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
-    params: { params: z.input<ParamsSchema> },
-) => Promise<ActionReturn<Return>>
+): Action<Return, ImplementationParamsSchema, ParamsSchema, undefined>
 
 export function makeAction<
     Return,
@@ -55,10 +48,7 @@ export function makeAction<
     DataSchema extends z.ZodTypeAny
 >(
     serviceOperation: ServiceOperation<boolean, Return, ParamsSchema, DataSchema, undefined>
-): (
-    params: { params: z.input<ParamsSchema> },
-    data: { data: z.input<DataSchema> } | FormData
-) => Promise<ActionReturn<Return>>
+): Action<Return, undefined, ParamsSchema, DataSchema>
 
 export function makeAction<
     Return,
@@ -66,11 +56,7 @@ export function makeAction<
     DataSchema extends z.ZodTypeAny
 >(
     serviceOperation: ServiceOperation<boolean, Return, undefined, DataSchema, ImplementationParamsSchema>
-): (
-    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
-    params: { params: unknown },
-    data: { data: z.input<DataSchema> } | FormData
-) => Promise<ActionReturn<Return>>
+): Action<Return, ImplementationParamsSchema, undefined, DataSchema>
 
 export function makeAction<
     Return,
@@ -79,11 +65,7 @@ export function makeAction<
     DataSchema extends z.ZodTypeAny
 >(
     serviceOperation: ServiceOperation<boolean, Return, ParamsSchema, DataSchema, ImplementationParamsSchema>
-): (
-    implementationParams: { implementationParams: z.input<ImplementationParamsSchema> },
-    params: { params: z.input<ParamsSchema> },
-    data: { data: z.input<DataSchema> } | FormData
-) => Promise<ActionReturn<Return>>
+): Action<Return, ImplementationParamsSchema, ParamsSchema, DataSchema>
 
 
 /**
@@ -94,12 +76,12 @@ export function makeAction<
  */
 export function makeAction<
     Return,
+    ImplementationParamsSchema extends z.ZodTypeAny | undefined = undefined,
     ParamsSchema extends z.ZodTypeAny | undefined = undefined,
-    DataSchema extends z.ZodTypeAny | undefined = undefined,
-    ImplementationParamsSchema extends z.ZodTypeAny | undefined = undefined
+    DataSchema extends z.ZodTypeAny | undefined = undefined
 >(
     serviceOperation: ServiceOperation<boolean, Return, ParamsSchema, DataSchema, ImplementationParamsSchema>
-) {
+): Action<Return, ImplementationParamsSchema, ParamsSchema, DataSchema> {
     // Letting the arguments to the actual function be unknown is safer as anything can be passed to it form the client.
     // The action and service operation will validate the parameter and data before it is used.
     //
@@ -110,7 +92,7 @@ export function makeAction<
         implementationParams: { implementationParams: unknown },
         params: { params: unknown },
         data: { data: unknown } | FormData,
-    ) => {
+    ): Promise<ActionReturn<Return>> => {
         const session = await Session.fromNextAuth()
 
         let processedData: unknown
@@ -137,12 +119,18 @@ export function makeAction<
     }
 
     if (serviceOperation.implementationParamsSchema) {
-        return actionUnsafe
+        return actionUnsafe as Action<Return, ImplementationParamsSchema, ParamsSchema, DataSchema>
     }
 
     if (serviceOperation.paramsSchema) {
-        return actionUnsafe.bind(null, { implementationParams: undefined })
+        return (
+            actionUnsafe.bind(null, { implementationParams: undefined }) as
+            Action<Return, ImplementationParamsSchema, ParamsSchema, DataSchema>
+        )
     }
 
-    return actionUnsafe.bind(null, { implementationParams: undefined }, { params: undefined })
+    return (
+        actionUnsafe.bind(null, { implementationParams: undefined }, { params: undefined }) as
+        Action<Return, ImplementationParamsSchema, ParamsSchema, DataSchema>
+    )
 }
diff --git a/src/services/serviceOperation.ts b/src/services/serviceOperation.ts
index a078f8aa0..62d9a77fe 100644
--- a/src/services/serviceOperation.ts
+++ b/src/services/serviceOperation.ts
@@ -2,6 +2,7 @@ import '@pn-server-only'
 import { ParseError, Smorekopp } from './error'
 import { prismaErrorWrapper } from './prismaCall'
 import { prisma as globalPrisma } from '@/prisma/client'
+import { RequireNothing } from '@/auth/auther/RequireNothing'
 import { Session } from '@/auth/session/Session'
 import { zfd } from 'zod-form-data'
 import { AsyncLocalStorage } from 'async_hooks'
@@ -70,46 +71,87 @@ export type SubServiceOperationConfig<
     DataSchema extends z.ZodTypeAny | undefined,
     ParamsSchemaImplementationFields extends object | undefined,
     DataSchemaImplementationFields extends object | undefined,
-    OperationImplementationParams extends object | undefined,
+    OperationImplementationFields extends object | undefined,
     Return,
     OpensTransaction extends boolean = false,
 > = {
     paramsSchema?: ((implementationFields: ParamsSchemaImplementationFields) => ParamsSchema) | undefined,
     dataSchema?: ((implementationFields: DataSchemaImplementationFields) => DataSchema) | undefined,
     opensTransaction?: OpensTransaction,
-    operation: (implementationParams: OperationImplementationParams) =>
+    operation: (implementationFields: OperationImplementationFields) =>
         ServiceOperationOperation<OpensTransaction, ParamsSchema, DataSchema, Return>
 }
 
+export type ArgsAuthGetterAndOwnershipCheck<
+    OpensTransaction extends boolean,
+    ParamsSchema extends z.ZodTypeAny | undefined,
+    DataSchema extends z.ZodTypeAny | undefined,
+    ImplementationParamsSchema extends z.ZodTypeAny | undefined
+> =
+    & ParamsObject<ParamsSchema, 'INFERED'>
+    & ImplementationParamsObject<ImplementationParamsSchema, 'INFERED'>
+    & DataObject<DataSchema, 'INFERED'>
+    & Pick<ServiceOperationContext<OpensTransaction>, 'prisma'>
+
 export type AutherGetter<
     OpensTransaction extends boolean,
     ParamsSchema extends z.ZodTypeAny | undefined,
     DataSchema extends z.ZodTypeAny | undefined,
     ImplementationParamsSchema extends z.ZodTypeAny | undefined
 > = (
-    args:
-        & ParamsObject<ParamsSchema, 'INFERED'>
-        & ImplementationParamsObject<ImplementationParamsSchema, 'INFERED'>
-        & DataObject<DataSchema, 'INFERED'>
-        & ServiceOperationContext<OpensTransaction>
+    args: ArgsAuthGetterAndOwnershipCheck<OpensTransaction, ParamsSchema, DataSchema, ImplementationParamsSchema>
 ) => AutherResult | Promise<AutherResult>
 
-export type ServiceOperationImplementationConfig<
+export type OwnershipCheck<
     OpensTransaction extends boolean,
-    ImplementationParamsSchema extends z.ZodTypeAny | undefined,
     ParamsSchema extends z.ZodTypeAny | undefined,
     DataSchema extends z.ZodTypeAny | undefined,
+    ImplementationParamsSchema extends z.ZodTypeAny | undefined
+> = (
+    args: ArgsAuthGetterAndOwnershipCheck<OpensTransaction, ParamsSchema, DataSchema, ImplementationParamsSchema>
+) => boolean | Promise<boolean>
+
+export type ServiceOperationImplementationConfigInternalCall<
+    ImplementationParamsSchema extends z.ZodTypeAny | undefined,
     ParamsSchemaImplementationFields extends object | undefined,
     DataSchemaImplementationFields extends object | undefined,
     OperationImplementationFields extends object | undefined,
-> = {
-    implementationParamsSchema: ImplementationParamsSchema,
-    authorizer: AutherGetter<OpensTransaction, ParamsSchema, DataSchema, ImplementationParamsSchema>,
+    > = {
+    implementationParamsSchema?: ImplementationParamsSchema,
+    paramsSchemaImplementationFields?: ParamsSchemaImplementationFields
+    dataSchemaImplementationFields?: DataSchemaImplementationFields
+    operationImplementationFields?: OperationImplementationFields
+} & (ParamsSchemaImplementationFields extends undefined ?
+    object
+ : {
     paramsSchemaImplementationFields: ParamsSchemaImplementationFields
+}) & (DataSchemaImplementationFields extends undefined ?
+    object
+ : {
     dataSchemaImplementationFields: DataSchemaImplementationFields
+}) & (OperationImplementationFields extends undefined ?
+    object
+ : {
     operationImplementationFields: OperationImplementationFields
-}
+})
 
+export type ServiceOperationImplementationConfig<
+    OpensTransaction extends boolean,
+    ImplementationParamsSchema extends z.ZodTypeAny | undefined,
+    ParamsSchema extends z.ZodTypeAny | undefined,
+    DataSchema extends z.ZodTypeAny | undefined,
+    ParamsSchemaImplementationFields extends object | undefined,
+    DataSchemaImplementationFields extends object | undefined,
+    OperationImplementationFields extends object | undefined,
+    > = ServiceOperationImplementationConfigInternalCall<
+    ImplementationParamsSchema,
+    ParamsSchemaImplementationFields,
+    DataSchemaImplementationFields,
+    OperationImplementationFields
+    > & {
+    authorizer: AutherGetter<OpensTransaction, ParamsSchema, DataSchema, ImplementationParamsSchema>,
+    ownershipCheck: OwnershipCheck<OpensTransaction, ParamsSchema, DataSchema, ImplementationParamsSchema>,
+}
 
 /**
  * This is the type for the prisma client that is passed to the service operation.
@@ -125,7 +167,7 @@ export type PrismaPossibleTransaction<
 /**
  * In addition to custom data arguments, every service operation receives a context object.
  */
-type ServiceOperationContext<OpensTransaction extends boolean = boolean> = {
+export type ServiceOperationContext<OpensTransaction extends boolean = boolean> = {
     prisma: PrismaPossibleTransaction<OpensTransaction>,
     session: SessionMaybeUser,
     bypassAuth: boolean,
@@ -200,19 +242,19 @@ export function defineSubOperation<
     DataSchema extends z.ZodTypeAny | undefined = undefined,
     ParamsSchemaImplementationFields extends object | undefined = undefined,
     DataSchemaImplementationFields extends object | undefined = undefined,
-    OperationImplementationParams extends object | undefined = undefined,
+    OperationImplementationFields extends object | undefined = undefined,
 >(
     serviceOperationConfig: SubServiceOperationConfig<
         ParamsSchema,
         DataSchema,
         ParamsSchemaImplementationFields,
         DataSchemaImplementationFields,
-        OperationImplementationParams,
+        OperationImplementationFields,
         Return,
         OpensTransaction
     >
 ) {
-    const implement = <ImplementationParamsSchema extends z.ZodTypeAny | undefined>(
+    const implement = <ImplementationParamsSchema extends z.ZodTypeAny | undefined = undefined>(
         implementationArgs: ServiceOperationImplementationConfig<
             OpensTransaction,
             ImplementationParamsSchema,
@@ -220,7 +262,7 @@ export function defineSubOperation<
             DataSchema,
             ParamsSchemaImplementationFields,
             DataSchemaImplementationFields,
-            OperationImplementationParams
+            OperationImplementationFields
         >
     ): ServiceOperation<OpensTransaction, Return, ParamsSchema, DataSchema, ImplementationParamsSchema> => {
         const expectedArgsArePresent = (
@@ -229,7 +271,7 @@ export function defineSubOperation<
             const paramsMatch = Boolean(args.params) === Boolean(serviceOperationConfig.paramsSchema)
             const dataMatches = Boolean(args.data) === Boolean(serviceOperationConfig.dataSchema)
             const implementationParamsMatch =
-                Boolean(args.implementationParams) === Boolean(implementationArgs.operationImplementationFields)
+            Boolean(args.implementationParams) === Boolean(implementationArgs.implementationParamsSchema)
             return paramsMatch && dataMatches && implementationParamsMatch
         }
 
@@ -242,7 +284,7 @@ export function defineSubOperation<
         const executeOperation = async ({
             implementationParams, params, data, ...context
         }:
-            &ServiceOperationExecuteArgs<'UNSAFE', ParamsSchema, DataSchema, ImplementationParamsSchema>
+            & ServiceOperationExecuteArgs<'UNSAFE', ParamsSchema, DataSchema, ImplementationParamsSchema>
             & Partial<ServiceOperationContext<OpensTransaction>>
         ): Promise<Return> => {
             const args = {
@@ -281,7 +323,7 @@ export function defineSubOperation<
                     )
                 }
                 const dataSchema = serviceOperationConfig.dataSchema(
-                    implementationArgs.dataSchemaImplementationFields
+                    implementationArgs.dataSchemaImplementationFields!
                 )
                 if (!dataSchema) {
                     throw new Smorekopp(
@@ -343,7 +385,9 @@ export function defineSubOperation<
                         )
                     }
 
-                    const authorizer = await implementationArgs.authorizer({ ...args, prisma, bypassAuth, session })
+                    const authorizer = await prismaErrorWrapper(
+                        () => implementationArgs.authorizer({ ...args, prisma })
+                    )
                     const authResult = authorizer.auth(session)
 
                     if (!authResult.authorized) {
@@ -351,26 +395,59 @@ export function defineSubOperation<
                     }
                 }
 
-                // Finally, call the operation.
-                return prismaErrorWrapper(() => {
-                    const operation = serviceOperationConfig.operation(args.implementationParams)
+                const ownershipCheckResult = await prismaErrorWrapper(
+                    () => implementationArgs.ownershipCheck({
+                        ...args,
+                        prisma,
+                    })
+                )
+                if (!ownershipCheckResult) {
+                    throw new Smorekopp('DISSALLOWED', `
+                        This resource cannot be accessed through this implementation
+                        as the resource implementing this resource does not own it.
+                    `)
+                }
 
-                    return operation({ ...args, prisma, bypassAuth, session })
-                })
+                // Finally, call the operation.
+                return prismaErrorWrapper(() =>
+                    serviceOperationConfig.operation(
+                        implementationArgs.operationImplementationFields!
+                    )({ ...args, prisma, bypassAuth, session })
+                )
             })
         }
 
         executeOperation.paramsSchema = serviceOperationConfig.paramsSchema
-            ? serviceOperationConfig.paramsSchema(implementationArgs.paramsSchemaImplementationFields)
+            ? serviceOperationConfig.paramsSchema(implementationArgs.paramsSchemaImplementationFields!)
             : undefined
         executeOperation.dataSchema = serviceOperationConfig.dataSchema
-            ? serviceOperationConfig.dataSchema(implementationArgs.dataSchemaImplementationFields)
+            ? serviceOperationConfig.dataSchema(implementationArgs.dataSchemaImplementationFields!)
             : undefined
         executeOperation.implementationParamsSchema = implementationArgs.implementationParamsSchema
 
         return executeOperation
     }
-    return { implement }
+    return {
+        implement,
+        /**
+         * Implements the sub-operation right away with require-nothing authorizer and "no" ownership check.
+         */
+        internalCall: (
+            args:
+            & ServiceOperationImplementationConfigInternalCall<
+                undefined,
+                ParamsSchemaImplementationFields,
+                DataSchemaImplementationFields,
+                OperationImplementationFields
+            >
+            & ServiceOperationExecuteArgs<'SAFE', ParamsSchema, DataSchema, undefined>
+            & Partial<ServiceOperationContext<OpensTransaction>>
+        ) => implement({
+            ...args,
+            authorizer: () => RequireNothing.staticFields({}).dynamicFields({}),
+            ownershipCheck: () => true,
+        })(args)
+    }
 }
 
 export function defineOperation<
@@ -400,9 +477,29 @@ export function defineOperation<
         dataSchema: dataSchema !== undefined ? () => dataSchema : undefined,
     }).implement({
         authorizer,
+        ownershipCheck: () => true,
         implementationParamsSchema: undefined,
         dataSchemaImplementationFields: undefined,
         paramsSchemaImplementationFields: undefined,
         operationImplementationFields: undefined,
     })
 }
+
+export type SubServiceOperation<
+    Return,
+    OpensTransaction extends boolean = false,
+    ParamsSchema extends z.ZodTypeAny | undefined = undefined,
+    DataSchema extends z.ZodTypeAny | undefined = undefined,
+    ParamsSchemaImplementationFields extends object | undefined = undefined,
+    DataSchemaImplementationFields extends object | undefined = undefined,
+    OperationImplementationFields extends object | undefined = undefined,
+> = ReturnType<typeof defineSubOperation<
+    Return,
+    OpensTransaction,
+    ParamsSchema,
+    DataSchema,
+    ParamsSchemaImplementationFields,
+    DataSchemaImplementationFields,
+    OperationImplementationFields
+>>
+
diff --git a/src/services/visibility/ConfigVars.ts b/src/services/visibility/ConfigVars.ts
index b2bd7eb87..cf5b67e51 100644
--- a/src/services/visibility/ConfigVars.ts
+++ b/src/services/visibility/ConfigVars.ts
@@ -6,8 +6,8 @@ import type { Permission, VisibilityPurpose, SpecialVisibilityPurpose } from '@p
  */
 export const BypassPermissions = {
     IMAGE: 'IMAGE_ADMIN',
-    NEWS_ARTICLE: 'CMS_ADMIN',
-    ARTICLE_CATEGORY: 'CMS_ADMIN',
+    NEWS_ARTICLE: 'FRONTPAGE_ADMIN', // just changed this to make ts happy - bypass and purposes will be removed
+    ARTICLE_CATEGORY: 'FRONTPAGE_ADMIN', // just changed this to make ts happy - bypass and purposes will be removed
     EVENT: 'EVENT_ADMIN',
     SPECIAL: null // null means there is no bypass permission
 } as const satisfies { [key in VisibilityPurpose]: Permission | null }
@@ -33,7 +33,7 @@ export const specialVisibilityConfig = {
     },
     PUBLIC: {
         regularLevel: null,
-        adminLevel: 'CMS_ADMIN'
+        adminLevel: 'FRONTPAGE_ADMIN' // just changed this to make ts happy
     },
     COMMITTEE: {
         regularLevel: 'COMMITTEE_READ',