diff --git a/app/controllers/users/contributions_controller.rb b/app/controllers/users/contributions_controller.rb
index 6c1d3574..bb02d63b 100644
--- a/app/controllers/users/contributions_controller.rb
+++ b/app/controllers/users/contributions_controller.rb
@@ -25,12 +25,18 @@ def new
     end
 
     def create
-      @osbl = Osbl.new(osbl_params)
+      osbl_params = contribution_params.delete(:osbl)
+      contribution = @user.contributions.build(contribution_params)
+      osbl = Osbl.new(osbl_params)
 
-      if @osbl.save
+      if osbl.valid?
+        osbl_data = OsblDataTransformer.new(osbl_params).transform
+        contribution.contributable = OsblCreation.new(osbl_data: osbl_data)
+
+        contribution.save!
         redirect_to my_contributions_path, success: "Votre contribution a été enregistrée."
       else
-        redirect_to my_new_contribution_path, inertia: {errors: @osbl.errors}
+        redirect_to my_new_contribution_path, inertia: {errors: osbl.errors}
       end
     end
 
@@ -40,62 +46,68 @@ def get_user
       @user = User.find(params[:user_id])
     end
 
-    def osbl_params
-      params.permit(
-        :name,
-        :website,
-        :logo,
-        :description,
-        {osbls_causes_attributes: [:cause_id]},
-        :tax_reduction,
-        {osbls_keywords_attributes: [:keyword_id]},
-        :geographical_scale,
-        {osbls_intervention_areas_attributes: [:intervention_area_id]},
-        :osbl_type,
-        :public_utility,
-        :creation_year,
-        {osbls_labels_attributes: [:label_id]},
-        {annual_finances_attributes: [
-          :year,
-          :certified,
-          :budget,
-          :treasury,
-          :employees_count,
-          {fund_sources_attributes: [
-            :type,
-            :percent,
-            :amount
-          ]},
-          {fund_allocations_attributes: [
-            :type,
-            :percent,
-            :amount
-          ]}
-        ]},
-        {document_attachments_attributes: [
-          {document_attributes: [
-            :type,
-            :file,
+    def contribution_params
+      @contribution_params ||= params.expect(
+        contribution: [
+          :body,
+          files: [],
+          osbl: [
             :name,
-            :year,
-            :description
-          ]}
-        ]},
-        {locations_attributes: [
-          :type,
-          :name,
-          :description,
-          :website,
-          {address_attributes: [
-            :street_number,
-            :street_name,
-            :additional_info,
-            :postal_code,
-            :city,
-            :latitude,
-            :longitude
-          ]}
-        ]}
+            :website,
+            :logo,
+            :description,
+            :tax_reduction,
+            :geographical_scale,
+            :osbl_type,
+            :public_utility,
+            :creation_year,
+            osbls_causes_attributes: [[:cause_id]],
+            osbls_keywords_attributes: [[:keyword_id]],
+            osbls_intervention_areas_attributes: [[:intervention_area_id]],
+            osbls_labels_attributes: [[:label_id]],
+            annual_finances_attributes: [[
+              :year,
+              :certified,
+              :budget,
+              :treasury,
+              :employees_count,
+              fund_sources_attributes: [[
+                :type,
+                :percent,
+                :amount
+              ]],
+              fund_allocations_attributes: [[
+                :type,
+                :percent,
+                :amount
+              ]]
+            ]],
+            document_attachments_attributes: [[
+              document_attributes: [
+                :type,
+                :file,
+                :name,
+                :year,
+                :description
+              ]
+            ]],
+            locations_attributes: [[
+              :type,
+              :name,
+              :description,
+              :website,
+              address_attributes: [
+                :street_number,
+                :street_name,
+                :additional_info,
+                :postal_code,
+                :city,
+                :latitude,
+                :longitude
+              ]
+            ]]
+          ]
+        ]
       )
     end
 
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index 67a507fc..88c37fdd 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -39,7 +39,7 @@ export default function OsblHeader ({ data, setData, errors, clearErrors }: Omit
 
         <MyFileInput
           id='logo'
-          accept='image/png, image/svg, image/webp'
+          accept='image/png, image/svg+xml, image/webp'
           labelText={
             <p className='flex items-center gap-2'>
               Logo
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 9da44dbc..e53ad2f2 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -1,8 +1,8 @@
 import { Head, useForm } from '@inertiajs/react'
-import { ReactElement } from 'react'
-import { Alert, AlertDescription } from '@/components/ui/alert'
+import { ReactElement, useState, useRef, useEffect } from 'react'
+// import { Alert, AlertDescription } from '@/components/ui/alert'
 // @ts-expect-error
-import GoodIdea from '@/assets/icons/good-idea.svg?react'
+// import GoodIdea from '@/assets/icons/good-idea.svg?react'
 import { Button } from '@/components/ui/button'
 import { Save } from 'lucide-react'
 import OsblHeader from '@/components/pages/contribution/new/OsblHeader'
@@ -11,42 +11,99 @@ import OsblFinance from '@/components/pages/contribution/new/OsblFinances'
 import OsblDocuments from '@/components/pages/contribution/new/OsblDocuments'
 import OsblLocations from '@/components/pages/contribution/new/OsblLocations'
 import { CurrentUserType } from '@/types/types'
-import { FormData } from '@/pages/Contribution/types'
+import { OsblCreationData, FormProps } from '@/pages/Contribution/types'
 import z from 'zod'
 import deepCleanData from '@/lib/deepCleanData'
 import { toast } from 'sonner'
-import { FormDataConvertible } from '@inertiajs/core'
 
 const MAX_LOGO_SIZE = 1 * 1024 * 1024 // 1MB
-const ALLOWED_LOGO_TYPES = ['image/svg', 'image/png', 'image/webp']
+const ALLOWED_LOGO_TYPES = ['image/svg+xml', 'image/png', 'image/webp']
 
 const validation = z.object({
-  website: z.string().url({ message: 'Veuillez entrer une URL valide.' }).optional(),
-  logo: z.instanceof(File)
-    .refine((file) => {
-      return file.size <= MAX_LOGO_SIZE
-    }, 'La taille du fichier doit être inférieure à 1 MB.')
-    .refine((file) => {
-      return ALLOWED_LOGO_TYPES.includes(file.type)
-    }, 'Le type de fichier est invalide. Format accepté : SVG, PNG, WEBP.')
-    .optional(),
-  osbls_causes_attributes: z.array(z.object({ cause_id: z.string() })).min(1, { message: 'Au moins une cause est requise.' }),
-  tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' })
+  contribution: z.object({
+    osbl: z.object({
+      website: z.string().url({ message: 'Veuillez entrer une URL valide.' }).optional(),
+      logo: z.instanceof(File)
+        .refine((file) => {
+          return file.size <= MAX_LOGO_SIZE
+        }, 'La taille du fichier doit être inférieure à 1 MB.')
+        .refine((file) => {
+          return ALLOWED_LOGO_TYPES.includes(file.type)
+        }, 'Le type de fichier est invalide. Format accepté : SVG, PNG, WEBP.')
+        .optional(),
+      osbls_causes_attributes: z.array(z.object({ cause_id: z.string() })).min(1, { message: 'Au moins une cause est requise.' }),
+      tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' })
+    })
+  })
 })
 
-type StrictForm<T> = T & {
-  [K in keyof T]: T[K] extends FormDataConvertible ? T[K] : never
-} & {
-  [key: string]: FormDataConvertible
+function createOsblProxy (
+  data: OsblCreationData,
+  setData: (key: string, value: any) => void,
+  errors: Record<string, string>,
+  clearErrors: (field: 'contribution') => void,
+  setError: (field: 'contribution', message: string) => void
+): FormProps {
+  return {
+    data: data.contribution.osbl,
+    setData: (key, value) => {
+      const updatedOsbl = {
+        ...data.contribution.osbl,
+        [key]: value
+      }
+
+      setData('contribution', {
+        ...data.contribution,
+        osbl: updatedOsbl
+      })
+    },
+    errors: Object.entries(errors).reduce<Record<string, string>>((acc, [key, value]) => {
+      const match = key.match(/^contribution\.osbl\.(.+)/)
+      if (match != null) {
+        acc[match[1]] = value
+      }
+      return acc
+    }, {}),
+    clearErrors: (field: string) => clearErrors(`contribution.osbl.${field}` as 'contribution'),
+    setError: (field, message) => setError(`contribution.osbl.${field}` as 'contribution', message)
+  }
 }
 
 export default function New ({ currentUser }: { currentUser: CurrentUserType }): ReactElement {
-  const { data, setData, post, processing, errors, clearErrors, setError, transform } = useForm<StrictForm<FormData>>({
-    name: '',
-    osbls_causes_attributes: [],
-    tax_reduction: ''
+  // inertia types don't handle nested data properly.
+  const { data, setData, post, processing, errors, clearErrors, setError, transform } = useForm({
+    contribution: {
+      osbl: {
+        name: '',
+        osbls_causes_attributes: [],
+        tax_reduction: ''
+      }
+    }
   })
 
+  // Create a proxy for the form props
+  const formProps = createOsblProxy(data, setData, errors, clearErrors, setError)
+
+  // Add state for button visibility
+  const [showBottomButton, setShowBottomButton] = useState(false)
+  const topButtonRef = useRef<HTMLButtonElement>(null)
+
+  // Add intersection observer
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        setShowBottomButton(!entry.isIntersecting)
+      },
+      { threshold: 1 }
+    )
+
+    if (topButtonRef.current != null) {
+      observer.observe(topButtonRef.current)
+    }
+
+    return () => observer.disconnect()
+  }, [])
+
   function submit (e: React.FormEvent<HTMLFormElement>): void {
     e.preventDefault()
 
@@ -55,7 +112,7 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
     if (!result.success) {
       const issues = result.error.issues
       issues.forEach(issue => {
-        setError(issue.path.join('.') as keyof FormData, issue.message)
+        setError(issue.path.join('.') as 'contribution', issue.message)
       })
 
       toast.error('Veuillez corriger les erreurs avant de continuer.')
@@ -78,35 +135,37 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
       <form onKeyDown={avoidUnintentionalSubmission} onSubmit={submit} className='2xl:container mx-auto flex flex-col px-2 sm:px-8 md:px-16 pt-8 pb-16 gap-8'>
         <div className='flex gap-8 sm:gap-16 items-center flex-wrap justify-center md:justify-start'>
           <h1 className='font-semibold text-2xl sm:text-3xl'>Ajouter une association</h1>
-          <Button type='submit' disabled={processing} className='text-lg'>
+          <Button ref={topButtonRef} type='submit' disabled={processing} className='text-lg'>
             <Save className='mr-2' />
             Enregistrer
           </Button>
         </div>
-        <Alert>
+        {/* <Alert>
           <GoodIdea className='min-w-8 min-h-8' />
           <AlertDescription>
             Pour que votre contribution soit validée, le modérateur doit pouvoir
             vérifier les informations fournies. Facilitez son travail en
             indiquant clairement vos sources !
           </AlertDescription>
-        </Alert>
+        </Alert> */}
 
         <div className='flex flex-col pt-4 gap-8'>
           <div className='grid grid-cols-1 lg:grid-cols-2 gap-8'>
-            <OsblHeader data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
-            <OsblDataSheet data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+            <OsblHeader {...formProps} />
+            <OsblDataSheet {...formProps} />
           </div>
           <div className='grid grid-cols-1 lg:grid-cols-3 gap-8'>
-            <OsblFinance data={data} setData={setData} errors={errors} clearErrors={clearErrors} setError={(field, message) => setError(field as keyof FormData, message)} />
-            <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} setError={(field, message) => setError(field as keyof FormData, message)} />
-            <OsblLocations data={data} setData={setData} />
+            <OsblFinance {...formProps} />
+            <OsblDocuments {...formProps} />
+            <OsblLocations {...formProps} />
           </div>
         </div>
-        <Button type='submit' disabled={processing} className='text-lg ml-auto mt-4 sm:mt-8'>
-          <Save className='mr-2' />
-          Enregistrer
-        </Button>
+        {showBottomButton && (
+          <Button type='submit' disabled={processing} className='text-lg ml-auto mt-4 sm:mt-8'>
+            <Save className='mr-2' />
+            Enregistrer
+          </Button>
+        )}
       </form>
     </>
   )
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index dd8ce133..80e327c1 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -48,7 +48,15 @@ export interface Location {
   website?: string
 }
 
-export interface FormData {
+export interface OsblCreationData {
+  contribution: {
+    body?: string
+    files?: File[]
+    osbl: OsblData
+  }
+}
+
+export interface OsblData {
   name: string
   website?: string
   logo?: File
@@ -68,9 +76,9 @@ export interface FormData {
 }
 
 export interface FormProps {
-  data: FormData
-  setData: (key: keyof FormData | string, value: FormData[keyof FormData] | any) => void
-  errors: Partial<Record<keyof FormData | string, string>>
-  clearErrors: (...fields: Array<keyof FormData | any>) => void
+  data: OsblData
+  setData: (key: keyof OsblData | string, value: OsblData[keyof OsblData] | any) => void
+  errors: Partial<Record<keyof OsblData | string, string>>
+  clearErrors: (...fields: Array<keyof OsblData | string>) => void
   setError: (field: string, error: any) => void
 }
diff --git a/app/frontend/tests/forms/SignUpForm.test.tsx b/app/frontend/tests/forms/SignUpForm.test.tsx
index 16b47172..e9e0c307 100644
--- a/app/frontend/tests/forms/SignUpForm.test.tsx
+++ b/app/frontend/tests/forms/SignUpForm.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach, Mock } from 'vitest'
 import { forwardRef, useImperativeHandle } from 'react'
 import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-import SignUpForm from '@/components/forms/SignUpForm'
+import SignUpForm from '@/components/pages/auth/signUp/SignUpForm'
 import useFormHandler from '@/hooks/useFormHandler'
 
 vi.mock('@inertiajs/react', async () => {
diff --git a/app/frontend/tests/pages/auth/SignIn.test.tsx b/app/frontend/tests/pages/auth/SignIn.test.tsx
index 524d24cf..0ddc521d 100644
--- a/app/frontend/tests/pages/auth/SignIn.test.tsx
+++ b/app/frontend/tests/pages/auth/SignIn.test.tsx
@@ -19,7 +19,7 @@ vi.mock('@inertiajs/react', async () => {
   }
 })
 
-vi.mock('@/components/forms/SignInForm', () => ({
+vi.mock('@/components/pages/auth/signIn/SignInForm', () => ({
   __esModule: true,
   default: vi.fn(() => <div data-testid='sign-in-form' />)
 }))
diff --git a/app/frontend/tests/pages/auth/SignUp.test.tsx b/app/frontend/tests/pages/auth/SignUp.test.tsx
index 19a41785..40ec08de 100644
--- a/app/frontend/tests/pages/auth/SignUp.test.tsx
+++ b/app/frontend/tests/pages/auth/SignUp.test.tsx
@@ -19,7 +19,7 @@ vi.mock('@inertiajs/react', async () => {
   }
 })
 
-vi.mock('@/components/forms/SignUpForm', () => ({
+vi.mock('@/components/pages/auth/signUp/SignUpForm', () => ({
   __esModule: true,
   default: vi.fn(() => <div data-testid='sign-up-form' />)
 }))
diff --git a/app/models/contribution.rb b/app/models/contribution.rb
index ae500a0b..dd69b934 100644
--- a/app/models/contribution.rb
+++ b/app/models/contribution.rb
@@ -1,12 +1,18 @@
 class Contribution < ApplicationRecord
   belongs_to :user
+
   delegated_type :contributable, types: %w[
     OsblCreation
     OsblUpdate
-    Discussion
+    Feedback
+    FeatureRequest
     BugReport
     CorrectionRequest
-  ]
+    Other
+  ], dependent: :destroy
+
+  has_many_attached :files
 
-  has_many :documents # , dependent: :destroy ## what would happen if a document was also used for an Osbl
+  # db_constraints enforcing :
+  # validates :body, presence: true, if: -> { %w[Feedback FeatureRequest BugReport CorrectionRequest Other].include?(contributable_type) }
 end
diff --git a/app/models/label.rb b/app/models/label.rb
index 3a1f59b6..45c40a6a 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -1,6 +1,14 @@
 class Label < ApplicationRecord
+  include AttachableValidation
+
   has_many :osbls_labels, dependent: :destroy
   has_many :osbls, through: :osbls_labels
 
   has_one_attached :logo
+
+  validates_attachment(
+    name: :logo,
+    max_size: 1.megabytes,
+    content_types: %w[image/svg+xml image/png image/webp]
+  )
 end
diff --git a/app/models/osbl.rb b/app/models/osbl.rb
index eed86c35..4023d725 100644
--- a/app/models/osbl.rb
+++ b/app/models/osbl.rb
@@ -54,7 +54,7 @@ class Osbl < ApplicationRecord
   validates_attachment(
     name: :logo,
     max_size: 1.megabytes,
-    content_types: %w[image/png image/svg image/webp]
+    content_types: %w[image/png image/svg+xml image/webp]
   )
   validates :osbls_causes, presence: {message: "Au moins une cause est requise."}
 
diff --git a/app/models/osbl_creation.rb b/app/models/osbl_creation.rb
new file mode 100644
index 00000000..374a823d
--- /dev/null
+++ b/app/models/osbl_creation.rb
@@ -0,0 +1,16 @@
+class OsblCreation < ApplicationRecord
+  has_one :contribution, as: :contributable, touch: true
+
+  STATUS = {
+    "brouillon" => 0,
+    "en cours de validation" => 1,
+    "nécessite des changements" => 2,
+    "validé" => 3,
+    "rejeté" => 4
+  }.freeze
+
+  serialize :osbl_data, coder: JSON
+
+  # db_constraints enforcing :
+  # validates :osbl_data, presence: true
+end
diff --git a/app/services/OsblDataTransformer.rb b/app/services/OsblDataTransformer.rb
new file mode 100644
index 00000000..967fac21
--- /dev/null
+++ b/app/services/OsblDataTransformer.rb
@@ -0,0 +1,36 @@
+class OsblDataTransformer
+  def initialize(params)
+    @params = params.to_h
+  end
+
+  def transform
+    transform_logo!
+    transform_documents!
+    @params
+  end
+
+  private
+
+  def transform_logo!
+    return if @params["logo"].blank?
+
+    @params["logo"] = process_file(@params["logo"])
+  end
+
+  def transform_documents!
+    return if @params["document_attachments_attributes"].blank?
+
+    @params["document_attachments_attributes"].each do |_, attachment|
+      attachment["document_attributes"]["file"] = process_file(attachment["document_attributes"]["file"])
+    end
+  end
+
+  def process_file(uploaded_file)
+    blob = ActiveStorage::Blob.create_and_upload!(
+      io: uploaded_file.tempfile,
+      filename: uploaded_file.original_filename,
+      content_type: uploaded_file.content_type
+    )
+    blob.signed_id
+  end
+end
diff --git a/db/migrate/20250205100116_add_status_to_contribution.rb b/db/migrate/20250205100116_add_status_to_contribution.rb
new file mode 100644
index 00000000..6199788b
--- /dev/null
+++ b/db/migrate/20250205100116_add_status_to_contribution.rb
@@ -0,0 +1,10 @@
+class AddStatusToContribution < ActiveRecord::Migration[8.0]
+  def change
+    add_column :contributions, :status, :integer, default: 0
+    add_column :contributions, :body, :text, null: true
+
+    add_check_constraint :contributions,
+      "NOT (contributable_type IN ('Feedback', 'FeatureRequest', 'BugReport', 'CorrectionRequest', 'Other')) OR body IS NOT NULL",
+      name: "body_required_for_specific_types"
+  end
+end
diff --git a/db/migrate/20250205100704_create_osbl_creations.rb b/db/migrate/20250205100704_create_osbl_creations.rb
new file mode 100644
index 00000000..bd7d386b
--- /dev/null
+++ b/db/migrate/20250205100704_create_osbl_creations.rb
@@ -0,0 +1,7 @@
+class CreateOsblCreations < ActiveRecord::Migration[8.0]
+  def change
+    create_table :osbl_creations do |t| # standard:disable Rails/CreateTableWithTimestamps
+      t.text :osbl_data, null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7709fbb1..511346bb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_02_04_105521) do
+ActiveRecord::Schema[8.0].define(version: 2025_02_05_100704) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -90,8 +90,11 @@
     t.string "github_resource_url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "status", default: 0
+    t.text "body"
     t.index ["contributable_type", "contributable_id"], name: "index_contributions_on_contributable"
     t.index ["user_id"], name: "index_contributions_on_user_id"
+    t.check_constraint "NOT (contributable_type IN ('Feedback', 'FeatureRequest', 'BugReport', 'CorrectionRequest', 'Other')) OR body IS NOT NULL", name: "body_required_for_specific_types"
   end
 
   create_table "document_attachments", force: :cascade do |t|
@@ -179,6 +182,10 @@
     t.check_constraint "type NOT IN (1, 2, 3) OR (type IN (1, 2, 3) AND name IS NOT NULL)", name: "name_required_for_specific_types"
   end
 
+  create_table "osbl_creations", force: :cascade do |t|
+    t.text "osbl_data", null: false
+  end
+
   create_table "osbls", force: :cascade do |t|
     t.string "name", null: false
     t.datetime "created_at", null: false
diff --git a/db/seeds.rb b/db/seeds.rb
index 8908c303..66207a18 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -60,7 +60,11 @@
   "promotion de l'économie circulaire",
   "soutien aux artistes locaux",
   "préservation des langues et cultures autochtones",
-  "sensibilisation à la cybersécurité pour les jeunes"
+  "sensibilisation à la cybersécurité pour les jeunes",
+  "altruisme",
+  "donateurs",
+  "plateform de dons",
+  "web"
 ]
 
 keywords.each do |keyword|
@@ -547,3 +551,95 @@
     l.website = label[:website]
   end
 end
+
+benefactorum_params = {
+  "name" => "Benefactorum",
+  "website" => "https://benefactorum.org/",
+  # "logo" =>
+  # {
+  #   "tempfile" => "#<File:0x00007836ee3e6f50>",
+  #   "content_type" => "image/png",
+  #   "original_filename" => "Benefactorum-Logo.png",
+  #   "headers" => "Content-Disposition: form-data; name=\"logo\"; filename=\"Benefactorum-Logo.png\"\r\nContent-Type: image/png\r\n"
+  # },
+  "description" =>
+  "Benefactorum est la première plateforme de dons\r\ncollaborative et à but non-lucratif,\r\nqui vous permet de découvrir et de soutenir facilement\r\ntoutes les causes qui vous tiennent à coeur !",
+  "osbls_causes_attributes" => {
+    "0" => {
+      "cause_id" => "13"
+    }
+  },
+  "tax_reduction" => "intérêt_général",
+  "osbls_keywords_attributes" => {
+    "0" => {
+      "keyword_id" => "36" # altruisme
+    },
+    "1" => {
+      "keyword_id" => "37" # donateurs
+    },
+    "2" => {
+      "keyword_id" => "38" # plateforme de dons
+    },
+    "3" => {
+      "keyword_id" => "39" # web
+    }
+  },
+  "geographical_scale" => "national",
+  "osbl_type" => "association",
+  "creation_year" => "2023",
+  # "document_attachments_attributes" =>
+  # {
+  #   "0" =>
+  #   {
+  #     "document_attributes" =>
+  #     {
+  #       "type" => "Statuts",
+  #        "file" =>
+  #        {
+  #          "tempfile" => "#<File:0x00007836eea1e8f0>",
+  #          "content_type" => "application/pdf",
+  #          "original_filename" => "Statuts Benefactorum.pdf",
+  #          "headers" => "Content-Disposition: form-data; name=\"document_attachments_attributes[0][document_attributes][file]\"; filename=\"Statuts Benefactorum.pdf\"\r\nContent-Type: application/pdf\r\n"
+  #        },
+  #       "name" => "Statuts de l'association",
+  #       "year" => "2023"
+  #     }
+  #   },
+  #   "1" =>
+  #   {
+  #     "document_attributes" =>
+  #     {
+  #       "type" => "Statuts",
+  #        "file" =>
+  #        {
+  #          "tempfile" => "#<File:0x00007836eea10c28>",
+  #          "content_type" => "application/pdf",
+  #          "original_filename" => "Statuts - Fonds Benefactorum.pdf",
+  #          "headers" =>
+  #          "Content-Disposition: form-data; name=\"document_attachments_attributes[1][document_attributes][file]\"; filename=\"Statuts - Fonds Benefactorum.pdf\"\r\nContent-Type: application/pdf\r\n"
+  #        },
+  #       "name" => "Statuts du fonds de dotation",
+  #       "year" => "2023"
+  #     }
+  #   }
+  # },
+  "locations_attributes" =>
+  {
+    "0" =>
+    {
+      "type" => "Siège social",
+      "address_attributes" => {
+        "street_number" => "12",
+        "street_name" => "Rue du moulin",
+        "postal_code" => "44260",
+        "city" => "La Chapelle-Launay",
+        "latitude" => "47.371354",
+        "longitude" => "-1.969269"
+      }
+    }
+  }
+}
+
+Osbl.find_or_create_by!(name: benefactorum_params["name"]) do |osbl|
+  osbl.assign_attributes(benefactorum_params)
+end
diff --git a/spec/factories/annual_finance.rb b/spec/factories/annual_finances.rb
similarity index 100%
rename from spec/factories/annual_finance.rb
rename to spec/factories/annual_finances.rb
diff --git a/spec/factories/contributions.rb b/spec/factories/contributions.rb
index 71535525..77559599 100644
--- a/spec/factories/contributions.rb
+++ b/spec/factories/contributions.rb
@@ -1,7 +1,11 @@
 FactoryBot.define do
   factory :contribution do
-    user { nil }
-    status { 0 }
-    contributable { nil }
+    association :user
+    status { "brouillon" }
+    contributable { build(:osbl_creation) }
+
+    trait :osbl_creation do
+      contributable { build(:osbl_creation) }
+    end
   end
 end
diff --git a/spec/factories/document.rb b/spec/factories/documents.rb
similarity index 100%
rename from spec/factories/document.rb
rename to spec/factories/documents.rb
diff --git a/spec/factories/fund_allocation.rb b/spec/factories/fund_allocations.rb
similarity index 100%
rename from spec/factories/fund_allocation.rb
rename to spec/factories/fund_allocations.rb
diff --git a/spec/factories/intervention_area.rb b/spec/factories/intervention_areas.rb
similarity index 100%
rename from spec/factories/intervention_area.rb
rename to spec/factories/intervention_areas.rb
diff --git a/spec/factories/keyword.rb b/spec/factories/keywords.rb
similarity index 100%
rename from spec/factories/keyword.rb
rename to spec/factories/keywords.rb
diff --git a/spec/factories/osbl_creations.rb b/spec/factories/osbl_creations.rb
new file mode 100644
index 00000000..2f135adc
--- /dev/null
+++ b/spec/factories/osbl_creations.rb
@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :osbl_creation do
+    osbl_data do
+      {
+        name: "OSBL 1",
+        tax_reduction: "intérêt_général",
+        osbls_causes_attributes: [{cause_id: 1}]
+      }
+    end
+  end
+end
diff --git a/spec/factories/osbls.rb b/spec/factories/osbls.rb
index 05a02c59..157c1e4b 100644
--- a/spec/factories/osbls.rb
+++ b/spec/factories/osbls.rb
@@ -6,5 +6,11 @@
     after(:build) do |osbl|
       osbl.causes << build(:cause) if osbl.causes.empty?
     end
+
+    trait :with_document do
+      after(:build) do |osbl|
+        osbl.documents << build(:document)
+      end
+    end
   end
 end
diff --git a/spec/factories/otp.rb b/spec/factories/otps.rb
similarity index 100%
rename from spec/factories/otp.rb
rename to spec/factories/otps.rb
diff --git a/spec/factories/session.rb b/spec/factories/sessions.rb
similarity index 100%
rename from spec/factories/session.rb
rename to spec/factories/sessions.rb
diff --git a/spec/factories/user.rb b/spec/factories/users.rb
similarity index 100%
rename from spec/factories/user.rb
rename to spec/factories/users.rb
diff --git a/spec/models/contribution_spec.rb b/spec/models/contribution_spec.rb
index 996a7351..9ea5493d 100644
--- a/spec/models/contribution_spec.rb
+++ b/spec/models/contribution_spec.rb
@@ -1,5 +1,41 @@
 require "rails_helper"
 
 RSpec.describe Contribution, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  describe "factory" do
+    it "is valid" do
+      expect(build(:contribution)).to be_valid
+    end
+
+    describe "osbl_creation" do
+      it "is valid" do
+        expect(build(:contribution, :osbl_creation)).to be_valid
+      end
+    end
+  end
+
+  describe "db_constraints" do
+    xcontext "when contributable_type requires body" do
+      %i[feedback feature_request bug_report correction_request other].each do |type|
+        it "enforces body presence for #{type}" do
+          contribution = build(:contribution, contributable: build(type, body: nil))
+          expect { contribution.save }.to raise_error(ActiveRecord::StatementInvalid)
+        end
+
+        it "allows saving #{type} with body present" do
+          contribution = build(:contribution, contributable: build(type, body: "Some content"))
+          expect { contribution.save }.not_to raise_error
+        end
+      end
+    end
+
+    context "when contributable_type does not require body" do
+      # %i[osbl_creation osbl_update].each do |type|
+      %i[osbl_creation].each do |type|
+        it "allows nil body for #{type}" do
+          contribution = build(:contribution, contributable: build(type))
+          expect { contribution.save }.not_to raise_error
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/document_spec.rb b/spec/models/document_spec.rb
index 4c2ab136..a807dfeb 100644
--- a/spec/models/document_spec.rb
+++ b/spec/models/document_spec.rb
@@ -61,7 +61,7 @@
     end
 
     it "is invalid with non-PDF file" do
-      document = build(:document, file: fixture_file_upload("spec/fixtures/files/invalid_file_type.svg", "image/svg"))
+      document = build(:document, file: fixture_file_upload("spec/fixtures/files/invalid_file_type.svg", "image/svg+xml"))
       expect(document).not_to be_valid
       expect(document.errors[:file]).to be_present
     end
diff --git a/spec/models/osbl_spec.rb b/spec/models/osbl_spec.rb
index 88518957..4afd3741 100644
--- a/spec/models/osbl_spec.rb
+++ b/spec/models/osbl_spec.rb
@@ -55,6 +55,21 @@
       expect(osbl).not_to be_valid
       expect(osbl.errors[:osbls_causes]).to be_present
     end
+
+    describe "associated documents" do
+      it "osbl is invalid with an invalid document" do
+        osbl = build(:osbl, document_attachments_attributes: [{
+          document_attributes: {
+            type: "Autre",
+            name: "Test document"
+            # file is missing, making document invalid
+          }
+        }])
+
+        expect(osbl).not_to be_valid
+        expect(osbl.errors[:"document_attachments.document.file"]).to be_present
+      end
+    end
   end
 
   # Association tests
diff --git a/spec/requests/contributions_spec.rb b/spec/requests/contributions_spec.rb
index 71d8d1cd..2535e34c 100644
--- a/spec/requests/contributions_spec.rb
+++ b/spec/requests/contributions_spec.rb
@@ -1,29 +1,6 @@
 require "rails_helper"
 
-# This spec was generated by rspec-rails when you ran the scaffold generator.
-# It demonstrates how one might use RSpec to test the controller code that
-# was generated by Rails when you ran the scaffold generator.
-#
-# It assumes that the implementation code is generated by the rails scaffold
-# generator. If you are using any extension libraries to generate different
-# controller code, this generated spec may or may not pass.
-#
-# It only uses APIs available in rails and/or rspec-rails. There are a number
-# of tools you can use to make these specs even more expressive, but we're
-# sticking to rails and rspec-rails APIs to keep things simple and stable.
-
 RSpec.describe "/contributions", type: :request, inertia: true do
-  # This should return the minimal set of attributes required to create a valid
-  # Contribution. As you add validations to Contribution, be sure to
-  # adjust the attributes here as well.
-  let(:valid_attributes) {
-    skip("Add a hash of attributes valid for your model")
-  }
-
-  let(:invalid_attributes) {
-    skip("Add a hash of attributes invalid for your model")
-  }
-
   describe "GET /index" do
     let(:user) { create(:user) }
     subject { get user_contributions_url(user) }
@@ -46,7 +23,6 @@
       end
 
       it "renders a successful response" do
-        # Contribution.create! valid_attributes
         subject
         expect(response).to be_successful
       end
@@ -64,7 +40,6 @@
       end
 
       it "renders a successful response" do
-        # Contribution.create! valid_attributes
         subject
         expect(response).to be_successful
       end
@@ -88,99 +63,184 @@
     end
   end
 
-  xdescribe "GET /show" do
-    it "renders a successful response" do
-      contribution = Contribution.create! valid_attributes
-      get contribution_url(contribution)
-      expect(response).to be_successful
-    end
-  end
+  describe "POST /create" do
+    let(:user) { create(:user) }
+    subject { post user_contributions_url(user), params: params }
+    let(:params) { valid_attributes }
 
-  xdescribe "GET /new" do
-    it "renders a successful response" do
-      get new_user_contribution_url
-      expect(response).to be_successful
-    end
-  end
+    it_behaves_like "only_for_current_user"
 
-  xdescribe "GET /edit" do
-    it "renders a successful response" do
-      contribution = Contribution.create! valid_attributes
-      get edit_contribution_url(contribution)
-      expect(response).to be_successful
+    before do
+      sign_in_as(user)
     end
-  end
 
-  xdescribe "POST /create" do
-    context "with valid parameters" do
-      it "creates a new Contribution" do
-        expect {
-          post contributions_url, params: {contribution: valid_attributes}
-        }.to change(Contribution, :count).by(1)
-      end
+    # Fixture files for logo and document attachments
+    let(:logo) do
+      Rack::Test::UploadedFile.new(
+        Rails.root.join("spec/fixtures/files/valid_file.png"),
+        "image/png"
+      )
+    end
 
-      it "redirects to the created contribution" do
-        post contributions_url, params: {contribution: valid_attributes}
-        expect(response).to redirect_to(contribution_url(Contribution.last))
-      end
+    let(:document_file) do
+      Rack::Test::UploadedFile.new(
+        Rails.root.join("spec/fixtures/files/sample.pdf"),
+        "application/pdf"
+      )
     end
 
-    context "with invalid parameters" do
-      it "does not create a new Contribution" do
-        expect {
-          post contributions_url, params: {contribution: invalid_attributes}
-        }.to change(Contribution, :count).by(0)
-      end
+    let(:valid_attributes) do
+      {
+        contribution: {
+          body: "Je suis le créateur de Benefactorum, vous trouverez toutes les informations sur le projet sur le site de Benefactorum et dans les documents associés.",
+          files: [document_file],
+          osbl: {
+            name: "Benefactorum",
+            website: "https://benefactorum.org/",
+            logo: logo,
+            description: "Benefactorum est la première plateforme de dons collaborative et à but non-lucratif, qui vous permet de découvrir et de soutenir facilement toutes les causes qui vous tiennent à cœur !",
+            osbls_causes_attributes: [{cause_id: 13}],
+            tax_reduction: "intérêt_général",
+            osbls_keywords_attributes: [
+              {keyword_id: 36},
+              {keyword_id: 37},
+              {keyword_id: 38},
+              {keyword_id: 39}
+            ],
+            geographical_scale: "national",
+            osbl_type: "association",
+            creation_year: 2023,
+            document_attachments_attributes: {
+              "0" => {
+                document_attributes: {
+                  type: "Statuts",
+                  file: document_file,
+                  name: "Statuts de l'association",
+                  year: 2023
+                }
+              },
+              "1" => {
+                document_attributes: {
+                  type: "Statuts",
+                  file: document_file,
+                  name: "Statuts du fonds de dotation",
+                  year: 2023
+                }
+              }
+            },
+            locations_attributes: {
+              "0" => {
+                type: "Siège social",
+                address_attributes: {
+                  street_number: "12",
+                  street_name: "Rue du moulin",
+                  postal_code: "44260",
+                  city: "La Chapelle-Launay",
+                  latitude: "47.371354",
+                  longitude: "-1.969269"
+                }
+              }
+            }
+          }
+        }
+      }
+    end
 
-      it "renders a response with 422 status (i.e. to display the 'new' template)" do
-        post contributions_url, params: {contribution: invalid_attributes}
-        expect(response).to have_http_status(:unprocessable_entity)
-      end
+    let(:invalid_attributes) do
+      {
+        contribution: {
+          osbl: {
+            name: "OSBL 1"
+            # missing required osbls_causes_attributes
+          }
+        }
+      }
     end
-  end
 
-  xdescribe "PATCH /update" do
     context "with valid parameters" do
-      let(:new_attributes) {
-        skip("Add a hash of attributes valid for your model")
-      }
+      before do
+        create(:cause, id: 13)
+        create(:keyword, id: 36)
+        create(:keyword, id: 37)
+        create(:keyword, id: 38)
+        create(:keyword, id: 39)
+      end
 
-      it "updates the requested contribution" do
-        contribution = Contribution.create! valid_attributes
-        patch contribution_url(contribution), params: {contribution: new_attributes}
-        contribution.reload
-        skip("Add assertions for updated state")
+      it "creates a new Contribution and transforms file parameters" do
+        expect {
+          subject
+        }.to change(Contribution, :count).by(1)
+          .and change(ActiveStorage::Blob, :count).by(4) # 1 file + 1 logo + 2 documents
+
+        contribution = Contribution.last
+        expect(contribution.body).to eq("Je suis le créateur de Benefactorum, vous trouverez toutes les informations sur le projet sur le site de Benefactorum et dans les documents associés.")
+        expect(contribution.files).to be_attached
+
+        osbl = Osbl.create!(contribution.osbl_creation.osbl_data)
+        expect(osbl.name).to eq("Benefactorum")
+        expect(osbl.website).to eq("https://benefactorum.org/")
+        expect(osbl.logo).to be_attached
+        expect(osbl.description).to eq("Benefactorum est la première plateforme de dons collaborative et à but non-lucratif, qui vous permet de découvrir et de soutenir facilement toutes les causes qui vous tiennent à cœur !")
+        expect(osbl.tax_reduction).to eq("intérêt_général")
+        expect(osbl.geographical_scale).to eq("national")
+        expect(osbl.osbl_type).to eq("association")
+        expect(osbl.creation_year).to eq(2023)
+
+        # Check causes
+        expect(osbl.osbls_causes.count).to eq(1)
+        expect(osbl.osbls_causes.first.cause_id).to eq(13)
+
+        # Check keywords
+        expect(osbl.osbls_keywords.count).to eq(4)
+        expect(osbl.osbls_keywords.pluck(:keyword_id)).to match_array([36, 37, 38, 39])
+
+        # Check documents
+        expect(osbl.document_attachments.count).to eq(2)
+        first_doc = osbl.document_attachments.first.document
+        second_doc = osbl.document_attachments.second.document
+
+        expect(first_doc.type).to eq("Statuts")
+        expect(first_doc.name).to eq("Statuts de l'association")
+        expect(first_doc.year).to eq(2023)
+        expect(first_doc.file).to be_attached
+
+        expect(second_doc.type).to eq("Statuts")
+        expect(second_doc.name).to eq("Statuts du fonds de dotation")
+        expect(second_doc.year).to eq(2023)
+        expect(second_doc.file).to be_attached
+
+        # Check location
+        expect(osbl.locations.count).to eq(1)
+        location = osbl.locations.first
+        expect(location.type).to eq("Siège social")
+
+        address = location.address
+        expect(address.street_number).to eq("12")
+        expect(address.street_name).to eq("Rue du moulin")
+        expect(address.postal_code).to eq("44260")
+        expect(address.city).to eq("La Chapelle-Launay")
+        expect(address.latitude).to eq(47.371354)
+        expect(address.longitude).to eq(-1.969269)
       end
 
-      it "redirects to the contribution" do
-        contribution = Contribution.create! valid_attributes
-        patch contribution_url(contribution), params: {contribution: new_attributes}
-        contribution.reload
-        expect(response).to redirect_to(contribution_url(contribution))
+      it "redirects to the contributions list" do
+        subject
+        expect(response).to redirect_to(my_contributions_url)
       end
     end
 
     context "with invalid parameters" do
-      it "renders a response with 422 status (i.e. to display the 'edit' template)" do
-        contribution = Contribution.create! valid_attributes
-        patch contribution_url(contribution), params: {contribution: invalid_attributes}
-        expect(response).to have_http_status(:unprocessable_entity)
+      let(:params) { invalid_attributes }
+      it "does not create a new Contribution" do
+        expect { subject }.to change(Contribution, :count).by(0)
       end
-    end
-  end
 
-  xdescribe "DELETE /destroy" do
-    it "destroys the requested contribution" do
-      contribution = Contribution.create! valid_attributes
-      expect {
-        delete contribution_url(contribution)
-      }.to change(Contribution, :count).by(-1)
-    end
-
-    it "redirects to the contributions list" do
-      contribution = Contribution.create! valid_attributes
-      delete contribution_url(contribution)
-      expect(response).to redirect_to(contributions_url)
+      it "redirects back to the new contribution form with errors" do
+        subject
+        expect(response).to redirect_to(my_new_contribution_url)
+        follow_redirect!
+        expect(inertia.props[:errors]["osbls_causes"]).to be_present
+      end
     end
   end
 end