diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5b01906..66950d9 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,16 +1,17 @@
 name: Check
 on:
   pull_request:
+
 jobs:
   detekt:
     name: Detekt Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches/
@@ -18,25 +19,27 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Run Detekt
         run: ./gradlew detekt --stacktrace
 
       - name: Stop Gradle
         run: ./gradlew --stop
+
   unit-tests:
     name: Unit Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches/
@@ -44,10 +47,11 @@ jobs:
           key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
           restore-keys: cache-gradle-
 
-      - name: Setup Java 15
-        uses: actions/setup-java@v1
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '15'
+          distribution: zulu
+          java-version: 17
 
       - name: Run Debug Unit Tests
         run: ./gradlew test --stacktrace
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
deleted file mode 100644
index 2287c77..0000000
--- a/.github/workflows/publish-snapshot.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#name: Publish Snaphot
-#on:
-#  workflow_dispatch:
-#  push:
-#    branches:
-#      - main
-#
-#jobs:
-#  deploy-maven-snapshot:
-#    name: Deploy To Maven Snaphot
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout Repository
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: '0'
-#
-#      - name: Cache Gradle
-#        uses: actions/cache@v2
-#        with:
-#          path: |
-#            ~/.gradle/caches/
-#            ~/.gradle/wrapper/
-#          key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
-#          restore-keys: cache-gradle-
-#
-#      - name: Setup Java 15
-#        uses: actions/setup-java@v1
-#        with:
-#          java-version: '15'
-#
-#      - name: Deploy Snapshot
-#        env:
-#          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-#          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-#        run: ./gradlew publish --no-daemon --no-parallel --stacktrace
-#
-#
-#      - name: Stop Gradle
-#        run: ./gradlew --stop
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 6e53383..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-#name: Publish
-#on:
-#  workflow_dispatch:
-#  push:
-#    tags:
-#      - '*.*.*'
-#
-#jobs:
-#  deploy-maven:
-#    name: Deploy To Maven
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout Repository
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: '0'
-#
-#      - name: Cache Gradle
-#        uses: actions/cache@v2
-#        with:
-#          path: |
-#            ~/.gradle/caches/
-#            ~/.gradle/wrapper/
-#          key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }}
-#          restore-keys: cache-gradle-
-#
-#      - name: Setup Java 15
-#        uses: actions/setup-java@v1
-#        with:
-#          java-version: '15'
-#
-#      - name: Deploy Release
-#        env:
-#          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-#          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-#          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SONATYPE_NEXUS_SIGNING_KEY }}
-#          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SONATYPE_NEXUS_SIGNING_KEY_PASSWORD }}
-#        run: ./gradlew publish --no-daemon --no-parallel --stacktrace
-#
-#      - name: Publish release
-#        env:
-#          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-#          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-#        run: ./gradlew closeAndReleaseRepository --no-daemon --no-parallel
-#
-#      - name: Github release
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        run: ./gradlew githubRelease
-#
-#      - name: Stop Gradle
-#        run: ./gradlew --stop
diff --git a/.github/workflows/publish_package.yaml b/.github/workflows/publish_package.yaml
index ada52f3..8f35f1a 100644
--- a/.github/workflows/publish_package.yaml
+++ b/.github/workflows/publish_package.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bd0dc93..55e7665 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,11 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="IMPORT_NESTED_CLASSES" value="true" />
       <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/README.md b/README.md
index 1994b8c..2b0f977 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,14 @@ Library is available on jitpack.
 
 ## Supported features
 - Selection (single, multiple or a range of days)
-- Every day as first day of week
+- Chose day as first day of week
 - Showing/hiding adjacent months
 - Month and week headers
 - Customizable month container
 - Fully customizable day content
 - Horizontal swipe for changing a current month
+- Month / Week mode
+- Min / Max Month (or Week) 
 
 ## Basic Usage
 Initialize the timezone information in your Application.onCreate() method
@@ -42,7 +44,15 @@ To show the basic version of the calendar, without any kind of selection mechani
 
 ```
 This chunk will render the calendar with default components for each day, and also month and week headers.
-See the `StaticCalendarSample` file for a full example.
+See the `StaticCalendarSample` file for a full example. For showing a week calendar, you can similarly use `StaticWeekCalendar`:
+```kotlin
+
+  @Composable
+  fun MainScreen() {
+    StaticWeekCalendar()
+  }
+
+```
 
 <img src="https://github.com/boguszpawlowski/ComposeCalendar/blob/main/blob/screenshot_1.jpg" width="260">
 
@@ -59,7 +69,16 @@ Calendar with a mechanism for selection. The default implementation uses `Dynami
 
 ```
 By the default, after changing the selection mode, selection is cleared.
-See the `SelectableCalendarSample` file for a full example
+See the `SelectableCalendarSample` file for a full example. For showing a week calendar, you can similarly use `SelectableWeekCalendar`:
+```kotlin
+
+  @Composable
+  fun MainScreen() {
+    SelectableWeekCalendar()
+  }
+
+```
+See the `WeekCalendarSample` file for a full example.
 
 https://user-images.githubusercontent.com/36514058/126049987-685a7b81-1596-48a4-95a1-c342f6c796bf.mp4
 
@@ -117,6 +136,10 @@ Apart from rendering your own components inside the calendar, you can modify it
 - `showAdjacentMonths` - whenever to render days from adjacent months. Defaults to `true`.
 - `firstDayOfWeek` - you can pass the `DayOfWeek` which you want you week to start with. It defaults to the first day of week of the `Locale.default()`.
 - `horizontalScrollEnabled` - a Boolean flag which enables month to be changed by a horizontal swipe. Defaults to `true`.
+- `minMonth` - a `YearMonth` object representing the minimum month that can be shown in the calendar. By default there is no minimum month.
+- `maxMonth` - a `YearMonth` object representing the maximum month that can be shown in the calendar. By default there is no maximum month.
+
+> :exclamation: You cannot set `minMonth` to be lower than `maxMonth` and vice versa. If you do so, the calendar state won't change.
 
 Apart from this, `Calendar` you can pass a `Modifier` object like in any other composable.
 
@@ -137,7 +160,7 @@ Initial state for the static calendar is provided by the `rememberCalendarState(
   fun MainScreen() {
     StaticCalendar(
       calendarState = rememberCalendarState(
-        initialDate = YearMonth.now().plusYears(1),
+        initialMonth = YearMonth.now().plusYears(1),
       )
     )
   }
@@ -151,7 +174,7 @@ In case of the selectable calendar, the state has additional parameters, used to
   fun MainScreen() {
     SelectableCalendar(
       calendarState = rememberSelectableCalendarState(
-        initialDate = YearMonth.now().plusYears(1),
+        initialMonth = YearMonth.now().plusYears(1),
         initialSelection = listOf(LocalDate.parse("20-01-2020")),
         initialSelectionMode = SelectionMode.Period,
       )
@@ -172,7 +195,7 @@ you need to hoist the state out of the `Calendar` composable:
     StaticCalendar(calendarState = calendarState)
    
     // now you can manipulate the state from scope of this composable
-    calendarState.monthState.currentMonth = MonthYear.of(2020, 5)
+    calendarState.monthState.currentMonth = YearMonth.of(2020, 5)
   }
 
 ```
@@ -186,9 +209,8 @@ Selection modes are represented by `SelectionMode` enum, with following values:
 - `Period` - selectable period - implemented by `start` and `end` dates. - selection will contain all dates between start and the end date.
 This implementation of SelectionState also allows for handling side-effects and vetoing the state change via `confirmSelectionChange` callback.
 
-## KotlinX DateTime
-As the core of the library is built on `java.time` library, on Android it requires to use [core libary desugaring](https://developer.android.com/studio/write/java8-support) to be able to access it's API.
-As a result it's features may be unavailable to some project built around different date-time libraries (e.g. kotlinx-datetime). Although the project wont be migrating from `java.time`, as it's the best suited for it, there is a separate `kotlinx-datetime` artifact for those who need to use the library from a codebase based on it. It doesn't consist of a separate version of `ComposeCalendar` features, but offers a small bunch of utilities, that will enable you to create your own wrapper, as briefly presented in `KotlinDateTimeSample`. If the provided functionality, doesn't match your use-case, please submit an issue.
+## Week Calendar
+Apart from the default calendar, there is also a week calendar, which shows a single week at a time. It can be used in the same way as the default calendar, and has the same customization options.
 
 ## License
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 4e9a516..9cc8b7e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,7 +35,7 @@ allprojects {
 
   tasks.withType<KotlinCompile> {
     kotlinOptions {
-      jvmTarget = "11"
+      jvmTarget = "17"
       freeCompilerArgs = freeCompilerArgs + listOf(
         "-progressive",
         "-Xopt-in=kotlin.RequiresOptIn",
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 41562db..d883a60 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -17,6 +17,6 @@ gradlePlugin {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:7.2.1")
-  implementation(kotlin("gradle-plugin", "1.7.20"))
+  implementation("com.android.tools.build:gradle:8.2.0")
+  implementation(kotlin("gradle-plugin", "1.8.10"))
 }
diff --git a/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt b/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt
index 8e9c59d..95d9a01 100644
--- a/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt
+++ b/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt
@@ -1,5 +1,5 @@
 import com.android.build.gradle.BaseExtension
-import org.gradle.api.JavaVersion.VERSION_1_8
+import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -18,8 +18,8 @@ class CommonAndroidPlugin : Plugin<Project> {
       }
 
       compileOptions {
-        sourceCompatibility = VERSION_1_8
-        targetCompatibility = VERSION_1_8
+        sourceCompatibility = VERSION_17
+        targetCompatibility = VERSION_17
         isCoreLibraryDesugaringEnabled = false
       }
 
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index aaa2c95..83a3dec 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,16 +1,16 @@
 @file:Suppress("ObjectPropertyNaming", "ClassNaming", "UnderscoresInNumericLiterals")
 object AndroidSdk {
   const val Min = 21
-  const val Compile = 32
+  const val Compile = 33
   const val Target = Compile
 }
 
 object Kotlin {
-  const val Version = "1.7.20"
+  const val Version = "1.9.20"
   const val CompatibilityPluginVersion = "0.11.0"
 
   const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version"
-  const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$Version"
+  const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
 
   const val SafeArgsPlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.0"
 
@@ -29,7 +29,7 @@ object Kotlin {
 }
 
 object Android {
-  const val GradlePlugin = "com.android.tools.build:gradle:7.2.1"
+  const val GradlePlugin = "com.android.tools.build:gradle:8.2.0"
 
   const val ApplicationPluginId = "com.android.application"
   const val LibraryPluginId = "com.android.library"
@@ -72,8 +72,8 @@ object AndroidX {
   const val Version = "1.0.0"
   const val LifecycleVersion = "2.2.0"
 
-  const val AppCompat = "androidx.appcompat:appcompat:1.4.1"
-  const val ComposeActivity = "androidx.activity:activity-compose:1.5.1"
+  const val AppCompat = "androidx.appcompat:appcompat:1.6.1"
+  const val ComposeActivity = "androidx.activity:activity-compose:1.6.1"
 }
 
 object Material {
@@ -81,7 +81,7 @@ object Material {
 }
 
 object DetektLib {
-  const val Version = "1.21.0"
+  const val Version = "1.23.4"
 
   const val PluginId = "io.gitlab.arturbosch.detekt"
   const val Plugin = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$Version"
@@ -96,8 +96,8 @@ object Timber {
 }
 
 object Compose {
-  const val Version = "1.2.1"
-  const val CompilerVersion = "1.3.2"
+  const val Version = "1.3.1"
+  const val CompilerVersion = "1.4.3"
   const val AccompanistVersion = "0.25.1"
 
   const val Runtime = "androidx.compose.runtime:runtime:$Version"
@@ -127,7 +127,7 @@ object Hyperion {
 }
 
 object Kotest {
-  const val Version = "5.1.0"
+  const val Version = "5.4.2"
 
   const val RunnerJunit5 = "io.kotest:kotest-runner-junit5-jvm:$Version"
 
@@ -144,3 +144,8 @@ object ComposeTest {
   const val Core = "androidx.compose.ui:ui-test-junit4:${Compose.Version}"
   const val Manifest = "androidx.compose.ui:ui-test-manifest:${Compose.Version}"
 }
+
+object Firebase {
+  const val Bom = "com.google.firebase:firebase-bom:30.0.0"
+  const val GoogleServicesPlugin = "com.google.gms:google-services:4.3.10"
+}
diff --git a/detekt-config.yml b/detekt-config.yml
index 86dbad2..92c2fcc 100644
--- a/detekt-config.yml
+++ b/detekt-config.yml
@@ -23,6 +23,7 @@ complexity:
     active: true
     functionThreshold: 10
     constructorThreshold: 5
+    ignoreAnnotated: [ 'Composable' ]
   NestedBlockDepth:
     active: true
   StringLiteralDuplication:
@@ -140,6 +141,7 @@ naming:
   FunctionNaming:
     active: false
     functionPattern: '^[a-z]+(?:[A-Z][a-z]+)*$'
+    ignoreAnnotated: [ 'Composable' ]
   FunctionParameterNaming:
     active: true
     parameterPattern: '^[a-z]+(?:[A-Z][a-z]+)*$'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c68..8bbcf0e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Feb 21 10:23:32 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 53a6b23..e69de29 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,91 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/kotlinx-datetime/gradle.properties b/kotlinx-datetime/gradle.properties
index dea31af..e69de29 100644
--- a/kotlinx-datetime/gradle.properties
+++ b/kotlinx-datetime/gradle.properties
@@ -1,3 +0,0 @@
-POM_ARTIFACT_ID=kotlinx-datetime
-POM_DESCRIPTION=A set of utilities supporting usage of kotlin datetime instead of java.time.
-POM_PACKAGING=aar
diff --git a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt
index 7887914..58935bb 100644
--- a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt
+++ b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt
@@ -5,7 +5,6 @@ import kotlinx.datetime.DayOfWeek
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
-import java.time.temporal.WeekFields
 import java.util.Locale
 
 public fun LocalDate.Companion.now(): LocalDate =
diff --git a/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt b/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt
index 6de0bf6..2de9efd 100644
--- a/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt
+++ b/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt
@@ -8,7 +8,6 @@ import io.kotest.data.forAll
 import io.kotest.data.table
 import io.kotest.matchers.shouldBe
 import kotlinx.datetime.DateTimeUnit
-import java.time.DateTimeException
 
 internal class YearMonthTest : ShouldSpec({
 
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 39232da..26c6738 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -8,13 +8,17 @@ plugins {
 }
 
 android {
-
+  namespace = "com.boguszpawlowski.composecalendar"
   defaultConfig.versionCode = 106
   defaultConfig.versionName = "1.0.6"
 
   tasks.withType<KotlinCompile> {
     kotlinOptions {
-      freeCompilerArgs = freeCompilerArgs + "-Xexplicit-api=strict"
+      freeCompilerArgs = freeCompilerArgs + listOf(
+        "-Xexplicit-api=strict",
+        "-Xcontext-receivers"
+      )
+
     }
   }
 }
diff --git a/library/gradle.properties b/library/gradle.properties
index 79d1798..e69de29 100644
--- a/library/gradle.properties
+++ b/library/gradle.properties
@@ -1,3 +0,0 @@
-POM_ARTIFACT_ID=composecalendar
-POM_DESCRIPTION=Library for handling the Calendar view in Jetpack Compose.
-POM_PACKAGING=aar
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index c9ba0e3..8bdb7e1 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.boguszpawlowski.composecalendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt
index c8113b1..e6f7ea4 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt
@@ -1,4 +1,4 @@
-@file:Suppress("MatchingDeclarationName", "LongParameterList")
+@file:Suppress("MatchingDeclarationName")
 
 package io.github.boguszpawlowski.composecalendar
 
@@ -17,14 +17,14 @@ import io.github.boguszpawlowski.composecalendar.day.DayState
 import io.github.boguszpawlowski.composecalendar.day.DefaultDay
 import io.github.boguszpawlowski.composecalendar.header.DefaultMonthHeader
 import io.github.boguszpawlowski.composecalendar.header.MonthState
-import io.github.boguszpawlowski.composecalendar.month.DaysOfWeek
 import io.github.boguszpawlowski.composecalendar.month.MonthContent
 import io.github.boguszpawlowski.composecalendar.month.MonthPager
 import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState
 import io.github.boguszpawlowski.composecalendar.selection.EmptySelectionState
 import io.github.boguszpawlowski.composecalendar.selection.SelectionMode
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
-import io.github.boguszpawlowski.composecalendar.week.DefaultWeekHeader
+import io.github.boguszpawlowski.composecalendar.week.DaysInAWeek
+import io.github.boguszpawlowski.composecalendar.week.DefaultDaysOfWeekHeader
 import io.github.boguszpawlowski.composecalendar.week.rotateRight
 import org.threeten.bp.DayOfWeek
 import org.threeten.bp.LocalDate
@@ -60,10 +60,11 @@ public class CalendarState<T : SelectionState>(
  * @param today current day, defaults to [LocalDate.now]
  * @param showAdjacentMonths whenever to show or hide the days from adjacent months
  * @param horizontalSwipeEnabled whenever user is able to change the month by horizontal swipe
+ * @param weekDaysScrollEnabled if the week days should be scrollable
  * @param calendarState state of the composable
  * @param dayContent composable rendering the current day
  * @param monthHeader header for showing the current month and controls for changing it
- * @param weekHeader header for showing captions for each day of week
+ * @param daysOfWeekHeader header for showing captions for each day of week
  * @param monthContainer container composable for all the days in current month
  */
 @Composable
@@ -74,10 +75,11 @@ public fun SelectableCalendar(
   isFullScreen: Boolean = false,
   showAdjacentMonths: Boolean = true,
   horizontalSwipeEnabled: Boolean = true,
+  weekDaysScrollEnabled: Boolean = true,
   calendarState: CalendarState<DynamicSelectionState> = rememberSelectableCalendarState(),
   dayContent: @Composable BoxScope.(DayState<DynamicSelectionState>) -> Unit = { DefaultDay(it) },
   monthHeader: @Composable ColumnScope.(MonthState) -> Unit = { DefaultMonthHeader(it) },
-  weekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultWeekHeader(it) },
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultDaysOfWeekHeader(it) },
   monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content ->
     Box { content(PaddingValues()) }
   },
@@ -89,10 +91,11 @@ public fun SelectableCalendar(
     isFullScreen = isFullScreen,
     showAdjacentMonths = showAdjacentMonths,
     horizontalSwipeEnabled = horizontalSwipeEnabled,
+    weekDaysScrollEnabled = weekDaysScrollEnabled,
     calendarState = calendarState,
     dayContent = dayContent,
     monthHeader = monthHeader,
-    weekHeader = weekHeader,
+    daysOfWeekHeader = daysOfWeekHeader,
     monthContainer = monthContainer
   )
 }
@@ -113,10 +116,11 @@ public fun SelectableCalendar(
  * @param today current day, defaults to [LocalDate.now]
  * @param showAdjacentMonths whenever to show or hide the days from adjacent months
  * @param horizontalSwipeEnabled whenever user is able to change the month by horizontal swipe
+ * @param weekDaysScrollEnabled if the week days should be scrollable
  * @param calendarState state of the composable
  * @param dayContent composable rendering the current day
  * @param monthHeader header for showing the current month and controls for changing it
- * @param weekHeader header for showing captions for each day of week
+ * @param daysOfWeekHeader header for showing captions for each day of week
  * @param monthContainer container composable for all the days in current month
  */
 @Composable
@@ -127,10 +131,11 @@ public fun StaticCalendar(
   isFullScreen: Boolean = false,
   showAdjacentMonths: Boolean = true,
   horizontalSwipeEnabled: Boolean = true,
+  weekDaysScrollEnabled: Boolean = true,
   calendarState: CalendarState<EmptySelectionState> = rememberCalendarState(),
   dayContent: @Composable BoxScope.(DayState<EmptySelectionState>) -> Unit = { DefaultDay(it) },
   monthHeader: @Composable ColumnScope.(MonthState) -> Unit = { DefaultMonthHeader(it) },
-  weekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultWeekHeader(it) },
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultDaysOfWeekHeader(it) },
   monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content ->
     Box { content(PaddingValues()) }
   },
@@ -142,10 +147,11 @@ public fun StaticCalendar(
     isFullScreen = isFullScreen,
     showAdjacentMonths = showAdjacentMonths,
     horizontalSwipeEnabled = horizontalSwipeEnabled,
+    weekDaysScrollEnabled = weekDaysScrollEnabled,
     calendarState = calendarState,
     dayContent = dayContent,
     monthHeader = monthHeader,
-    weekHeader = weekHeader,
+    daysOfWeekHeader = daysOfWeekHeader,
     monthContainer = monthContainer
   )
 }
@@ -164,7 +170,7 @@ public fun StaticCalendar(
  * @param calendarState state of the composable
  * @param dayContent composable rendering the current day
  * @param monthHeader header for showing the current month and controls for changing it
- * @param weekHeader header for showing captions for each day of week
+ * @param daysOfWeekHeader header for showing captions for each day of week
  * @param monthContainer container composable for all the days in current month
  */
 @Composable
@@ -176,16 +182,17 @@ public fun <T : SelectionState> Calendar(
   isFullScreen: Boolean = false,
   showAdjacentMonths: Boolean = true,
   horizontalSwipeEnabled: Boolean = true,
+  weekDaysScrollEnabled: Boolean = true,
   dayContent: @Composable BoxScope.(DayState<T>) -> Unit = { DefaultDay(it) },
   monthHeader: @Composable ColumnScope.(MonthState) -> Unit = { DefaultMonthHeader(it) },
-  weekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultWeekHeader(it) },
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultDaysOfWeekHeader(it) },
   monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content ->
     Box { content(PaddingValues()) }
   },
 ) {
   val initialMonth = remember { calendarState.monthState.currentMonth }
   val daysOfWeek = remember(firstDayOfWeek) {
-    DayOfWeek.values().rotateRight(DaysOfWeek - firstDayOfWeek.ordinal)
+    DayOfWeek.values().rotateRight(DaysInAWeek - firstDayOfWeek.ordinal)
   }
 
   Column(
@@ -200,9 +207,10 @@ public fun <T : SelectionState> Calendar(
         monthState = calendarState.monthState,
         selectionState = calendarState.selectionState,
         today = today,
+        weekDaysScrollEnabled = weekDaysScrollEnabled,
         daysOfWeek = daysOfWeek,
         dayContent = dayContent,
-        weekHeader = weekHeader,
+        weekHeader = daysOfWeekHeader,
         monthContainer = monthContainer,
       )
     } else {
@@ -213,9 +221,10 @@ public fun <T : SelectionState> Calendar(
         showAdjacentMonths = showAdjacentMonths,
         selectionState = calendarState.selectionState,
         today = today,
+        weekDaysScrollEnabled = weekDaysScrollEnabled,
         daysOfWeek = daysOfWeek,
         dayContent = dayContent,
-        weekHeader = weekHeader,
+        weekHeader = daysOfWeekHeader,
         monthContainer = monthContainer,
       )
     }
@@ -229,15 +238,24 @@ public fun <T : SelectionState> Calendar(
  * @param initialSelection initial selection of the composable
  * @param initialSelectionMode initial mode of the selection
  * @param confirmSelectionChange callback for optional side-effects handling and vetoing the state change
+ * @param confirmSelectionChange callback for optional side-effects handling and vetoing the state change
+ * @param minMonth first month that can be shown
+ * @param maxMonth last month that can be shown
  */
 @Composable
 public fun rememberSelectableCalendarState(
   initialMonth: YearMonth = YearMonth.now(),
+  minMonth: YearMonth = initialMonth.minusMonths(DefaultCalendarPagerRange),
+  maxMonth: YearMonth = initialMonth.plusMonths(DefaultCalendarPagerRange),
   initialSelection: List<LocalDate> = emptyList(),
   initialSelectionMode: SelectionMode = SelectionMode.Single,
   confirmSelectionChange: (newValue: List<LocalDate>) -> Boolean = { true },
   monthState: MonthState = rememberSaveable(saver = MonthState.Saver()) {
-    MonthState(initialMonth = initialMonth)
+    MonthState(
+      initialMonth = initialMonth,
+      minMonth = minMonth,
+      maxMonth = maxMonth
+    )
   },
   selectionState: DynamicSelectionState = rememberSaveable(
     saver = DynamicSelectionState.Saver(confirmSelectionChange),
@@ -250,11 +268,21 @@ public fun rememberSelectableCalendarState(
  * Helper function for providing a [CalendarState] implementation without a selection mechanism.
  *
  * @param initialMonth initially rendered month
+ * @param minMonth first month that can be shown
+ * @param maxMonth last month that can be shown
  */
 @Composable
 public fun rememberCalendarState(
   initialMonth: YearMonth = YearMonth.now(),
+  minMonth: YearMonth = initialMonth.minusMonths(DefaultCalendarPagerRange),
+  maxMonth: YearMonth = initialMonth.plusMonths(DefaultCalendarPagerRange),
   monthState: MonthState = rememberSaveable(saver = MonthState.Saver()) {
-    MonthState(initialMonth = initialMonth)
+    MonthState(
+      initialMonth = initialMonth,
+      minMonth = minMonth,
+      maxMonth = maxMonth
+    )
   },
 ): CalendarState<EmptySelectionState> = remember { CalendarState(monthState, EmptySelectionState) }
+
+internal const val DefaultCalendarPagerRange = 10_000L
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt
new file mode 100644
index 0000000..45fc24b
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt
@@ -0,0 +1,259 @@
+@file:Suppress("MatchingDeclarationName", "LongParameterList")
+
+package io.github.boguszpawlowski.composecalendar
+
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Modifier
+import io.github.boguszpawlowski.composecalendar.day.DayState
+import io.github.boguszpawlowski.composecalendar.day.DefaultDay
+import io.github.boguszpawlowski.composecalendar.header.WeekState
+import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState
+import io.github.boguszpawlowski.composecalendar.selection.EmptySelectionState
+import io.github.boguszpawlowski.composecalendar.selection.SelectionMode
+import io.github.boguszpawlowski.composecalendar.selection.SelectionState
+import io.github.boguszpawlowski.composecalendar.week.DaysInAWeek
+import io.github.boguszpawlowski.composecalendar.week.DefaultDaysOfWeekHeader
+import io.github.boguszpawlowski.composecalendar.week.Week
+import io.github.boguszpawlowski.composecalendar.week.WeekContent
+import io.github.boguszpawlowski.composecalendar.week.WeekPager
+import io.github.boguszpawlowski.composecalendar.week.getWeekDays
+import io.github.boguszpawlowski.composecalendar.week.rotateRight
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
+import org.threeten.bp.temporal.WeekFields
+import java.util.Locale
+import io.github.boguszpawlowski.composecalendar.header.DefaultWeekHeader as DefaultProperWeekHeader
+
+/**
+ * State of the week calendar composable
+ *
+ * @property weekState currently showed week
+ * @property selectionState handler for the calendar's selection
+ */
+@Stable
+public class WeekCalendarState<T : SelectionState>(
+  public val weekState: WeekState,
+  public val selectionState: T,
+)
+
+/**
+ * [WeekCalendar] implementation using a [DynamicSelectionState] as a selection handler.
+ *
+ *  * Basic usage:
+ * ```
+ *  @Composable
+ *  fun MainScreen() {
+ *    SelectableWeekCalendar()
+ *  }
+ * ```
+ *
+ * @param modifier
+ * @param firstDayOfWeek first day of a week, defaults to current locale's
+ * @param today current day, defaults to [LocalDate.now]
+ * @param horizontalSwipeEnabled whenever user is able to change the week by horizontal swipe
+ * @param weekDaysScrollEnabled if the week days should be scrollable
+ * @param calendarState state of the composable
+ * @param dayContent composable rendering the current day
+ * @param weekHeader header for showing the current week and controls for changing it
+ * @param daysOfWeekHeader header for showing captions for each day of week
+ */
+@Composable
+public fun SelectableWeekCalendar(
+  modifier: Modifier = Modifier,
+  firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
+  today: LocalDate = LocalDate.now(),
+  horizontalSwipeEnabled: Boolean = true,
+  weekDaysScrollEnabled: Boolean = true,
+  calendarState: WeekCalendarState<DynamicSelectionState> = rememberSelectableWeekCalendarState(),
+  dayContent: @Composable BoxScope.(DayState<DynamicSelectionState>) -> Unit = { DefaultDay(it) },
+  weekHeader: @Composable ColumnScope.(WeekState) -> Unit = {
+    DefaultProperWeekHeader(it)
+  },
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultDaysOfWeekHeader(it) },
+) {
+  WeekCalendar(
+    modifier = modifier,
+    calendarState = calendarState,
+    today = today,
+    horizontalSwipeEnabled = horizontalSwipeEnabled,
+    firstDayOfWeek = firstDayOfWeek,
+    weekDaysScrollEnabled = weekDaysScrollEnabled,
+    dayContent = dayContent,
+    weekHeader = weekHeader,
+    daysOfWeekHeader = daysOfWeekHeader,
+  )
+}
+
+/**
+ * [WeekCalendar] implementation without any mechanism for the selection.
+ *
+ *  * Basic usage:
+ * ```
+ *  @Composable
+ *  fun MainScreen() {
+ *    StaticWeekCalendar()
+ *  }
+ * ```
+ *
+ * @param modifier
+ * @param firstDayOfWeek first day of a week, defaults to current locale's
+ * @param today current day, defaults to [LocalDate.now]
+ * @param horizontalSwipeEnabled whenever user is able to change the week by horizontal swipe
+ * @param calendarState state of the composable
+ * @param dayContent composable rendering the current day
+ * @param weekHeader header for showing the current week and controls for changing it
+ * @param daysOfWeekHeader header for showing captions for each day of week
+ */
+@Composable
+public fun StaticWeekCalendar(
+  modifier: Modifier = Modifier,
+  firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
+  today: LocalDate = LocalDate.now(),
+  horizontalSwipeEnabled: Boolean = true,
+  calendarState: WeekCalendarState<EmptySelectionState> = rememberWeekCalendarState(),
+  weekDaysScrollEnabled: Boolean = true,
+  dayContent: @Composable BoxScope.(DayState<EmptySelectionState>) -> Unit = { DefaultDay(it) },
+  weekHeader: @Composable ColumnScope.(WeekState) -> Unit = {
+    DefaultProperWeekHeader(it)
+  },
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultDaysOfWeekHeader(it) },
+) {
+  WeekCalendar(
+    modifier = modifier,
+    calendarState = calendarState,
+    today = today,
+    horizontalSwipeEnabled = horizontalSwipeEnabled,
+    firstDayOfWeek = firstDayOfWeek,
+    weekDaysScrollEnabled = weekDaysScrollEnabled,
+    dayContent = dayContent,
+    weekHeader = weekHeader,
+    daysOfWeekHeader = daysOfWeekHeader,
+  )
+}
+
+/**
+ * Composable for showing a week calendar. The calendar state has to be provided by the call site. If you
+ * want to use built-in implementation, check out:
+ * [SelectableWeekCalendar] - calendar composable handling selection that can be changed at runtime
+ * [StaticWeekCalendar] - calendar without any mechanism for selection
+ *
+ * @param modifier
+ * @param firstDayOfWeek first day of a week, defaults to current locale's
+ * @param today current day, defaults to [LocalDate.now]
+ * @param horizontalSwipeEnabled whenever user is able to change the week by horizontal swipe
+ * @param calendarState state of the composable
+ * @param dayContent composable rendering the current day
+ * @param weekHeader header for showing the current week and controls for changing it
+ * @param daysOfWeekHeader header for showing captions for each day of week
+ */
+@Composable
+public fun <T : SelectionState> WeekCalendar(
+  calendarState: WeekCalendarState<T>,
+  modifier: Modifier = Modifier,
+  today: LocalDate = LocalDate.now(),
+  firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
+  horizontalSwipeEnabled: Boolean = true,
+  weekDaysScrollEnabled: Boolean = true,
+  dayContent: @Composable BoxScope.(DayState<T>) -> Unit = { DefaultDay(it) },
+  weekHeader: @Composable ColumnScope.(WeekState) -> Unit = {
+    DefaultProperWeekHeader(it)
+  },
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit = { DefaultDaysOfWeekHeader(it) },
+) {
+  val initialWeek = remember { calendarState.weekState.currentWeek }
+  val daysOfWeek = remember(firstDayOfWeek) {
+    DayOfWeek.values().rotateRight(DaysInAWeek - firstDayOfWeek.ordinal)
+  }
+
+  Column(
+    modifier = modifier,
+  ) {
+    weekHeader(calendarState.weekState)
+    if (horizontalSwipeEnabled) {
+      WeekPager(
+        initialWeek = initialWeek,
+        daysOfWeek = daysOfWeek,
+        weekState = calendarState.weekState,
+        selectionState = calendarState.selectionState,
+        today = today,
+        weekDaysScrollEnabled = weekDaysScrollEnabled,
+        dayContent = dayContent,
+        daysOfWeekHeader = daysOfWeekHeader,
+      )
+    } else {
+      WeekContent(
+        daysOfWeek = daysOfWeek,
+        weekDays = calendarState.weekState.currentWeek.getWeekDays(today),
+        selectionState = calendarState.selectionState,
+        weekDaysScrollEnabled = weekDaysScrollEnabled,
+        dayContent = dayContent,
+        daysOfWeekHeader = daysOfWeekHeader,
+      )
+    }
+  }
+}
+
+/**
+ * Helper function for providing a [WeekCalendarState] implementation with selection mechanism.
+ *
+ * @param firstDayOfWeek first day of a week, defaults to current locale's
+ * @param initialWeek initially rendered month
+ * @param initialSelection initial selection of the composable
+ * @param initialSelectionMode initial mode of the selection
+ * @param confirmSelectionChange callback for optional side-effects handling and vetoing the state change
+ * @param minWeek first week that can be shown
+ * @param maxWeek last week that can be shown
+ */
+@Composable
+public fun rememberSelectableWeekCalendarState(
+  firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
+  initialWeek: Week = Week.now(firstDayOfWeek),
+  minWeek: Week = initialWeek.minusWeeks(DefaultCalendarPagerRange),
+  maxWeek: Week = initialWeek.plusWeeks(DefaultCalendarPagerRange),
+  initialSelection: List<LocalDate> = emptyList(),
+  initialSelectionMode: SelectionMode = SelectionMode.Single,
+  confirmSelectionChange: (newValue: List<LocalDate>) -> Boolean = { true },
+  weekState: WeekState = rememberSaveable(saver = WeekState.Saver()) {
+    WeekState(
+      initialWeek = initialWeek,
+      minWeek = minWeek,
+      maxWeek = maxWeek,
+    )
+  },
+  selectionState: DynamicSelectionState = rememberSaveable(
+    saver = DynamicSelectionState.Saver(confirmSelectionChange),
+  ) {
+    DynamicSelectionState(confirmSelectionChange, initialSelection, initialSelectionMode)
+  },
+): WeekCalendarState<DynamicSelectionState> =
+  remember { WeekCalendarState(weekState, selectionState) }
+
+/**
+ * Helper function for providing a [WeekCalendarState] implementation without a selection mechanism.
+ *
+ * @param firstDayOfWeek first day of a week, defaults to current locale's
+ * @param initialWeek initially rendered week
+ * @param minWeek first week that can be shown
+ * @param maxWeek last week that can be shown
+ */
+@Composable
+public fun rememberWeekCalendarState(
+  firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek,
+  initialWeek: Week = Week.now(firstDayOfWeek),
+  minWeek: Week = initialWeek.minusWeeks(DefaultCalendarPagerRange),
+  maxWeek: Week = initialWeek.plusWeeks(DefaultCalendarPagerRange),
+  weekState: WeekState = rememberSaveable(saver = WeekState.Saver()) {
+    WeekState(
+      initialWeek = initialWeek,
+      minWeek = minWeek,
+      maxWeek = maxWeek,
+    )
+  },
+): WeekCalendarState<EmptySelectionState> =
+  remember { WeekCalendarState(weekState, EmptySelectionState) }
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt
index 8735838..bd99bac 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt
@@ -35,16 +35,7 @@ public fun DefaultMonthHeader(
     horizontalArrangement = Arrangement.Center,
     verticalAlignment = Alignment.CenterVertically,
   ) {
-    IconButton(
-      modifier = Modifier.testTag("Decrement"),
-      onClick = { monthState.currentMonth = monthState.currentMonth.minusMonths(1) }
-    ) {
-      Image(
-        imageVector = Icons.Default.KeyboardArrowLeft,
-        colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
-        contentDescription = "Previous",
-      )
-    }
+    DecrementButton(monthState = monthState)
     Text(
       modifier = Modifier.testTag("MonthLabel"),
       text = monthState.currentMonth.month
@@ -55,15 +46,40 @@ public fun DefaultMonthHeader(
     )
     Spacer(modifier = Modifier.width(8.dp))
     Text(text = monthState.currentMonth.year.toString(), style = MaterialTheme.typography.h4)
-    IconButton(
-      modifier = Modifier.testTag("Increment"),
-      onClick = { monthState.currentMonth = monthState.currentMonth.plusMonths(1) }
-    ) {
-      Image(
-        imageVector = Icons.Default.KeyboardArrowRight,
-        colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
-        contentDescription = "Next",
-      )
-    }
+    IncrementButton(monthState = monthState)
+  }
+}
+
+@Composable
+private fun DecrementButton(
+  monthState: MonthState,
+) {
+  IconButton(
+    modifier = Modifier.testTag("Decrement"),
+    enabled = monthState.currentMonth > monthState.minMonth,
+    onClick = { monthState.currentMonth = monthState.currentMonth.minusMonths(1) }
+  ) {
+    Image(
+      imageVector = Icons.Default.KeyboardArrowLeft,
+      colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
+      contentDescription = "Previous",
+    )
+  }
+}
+
+@Composable
+private fun IncrementButton(
+  monthState: MonthState,
+) {
+  IconButton(
+    modifier = Modifier.testTag("Increment"),
+    enabled = monthState.currentMonth < monthState.maxMonth,
+    onClick = { monthState.currentMonth = monthState.currentMonth.plusMonths(1) }
+  ) {
+    Image(
+      imageVector = Icons.Default.KeyboardArrowRight,
+      colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
+      contentDescription = "Next",
+    )
   }
 }
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt
new file mode 100644
index 0000000..6d49931
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt
@@ -0,0 +1,89 @@
+package io.github.boguszpawlowski.composecalendar.header
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowLeft
+import androidx.compose.material.icons.filled.KeyboardArrowRight
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.dp
+import org.threeten.bp.format.TextStyle
+import java.util.Locale
+
+/**
+ * Default implementation of week header, shows current month and year, as well as
+ * 2 arrows for changing currently showed month
+ */
+@Composable
+@Suppress("LongMethod")
+public fun DefaultWeekHeader(
+  weekState: WeekState,
+  modifier: Modifier = Modifier,
+) {
+  Row(
+    modifier = modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.Center,
+    verticalAlignment = Alignment.CenterVertically,
+  ) {
+    DecrementButton(weekState = weekState)
+    Text(
+      modifier = Modifier.testTag("WeekLabel"),
+      text = weekState.currentWeek.yearMonth.month
+        .getDisplayName(TextStyle.FULL, Locale.getDefault())
+        .lowercase()
+        .replaceFirstChar { it.titlecase() },
+      style = MaterialTheme.typography.h4,
+    )
+    Spacer(modifier = Modifier.width(8.dp))
+    Text(
+      text = weekState.currentWeek.yearMonth.year.toString(),
+      style = MaterialTheme.typography.h4
+    )
+    IncrementButton(monthState = weekState)
+  }
+}
+
+@Composable
+private fun DecrementButton(
+  weekState: WeekState,
+) {
+  IconButton(
+    modifier = Modifier.testTag("Decrement"),
+    enabled = weekState.currentWeek > weekState.minWeek,
+    onClick = { weekState.currentWeek = weekState.currentWeek.dec() }
+  ) {
+    Image(
+      imageVector = Icons.Default.KeyboardArrowLeft,
+      colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
+      contentDescription = "Previous",
+    )
+  }
+}
+
+@Composable
+private fun IncrementButton(
+  monthState: WeekState,
+) {
+  IconButton(
+    modifier = Modifier.testTag("Increment"),
+    enabled = monthState.currentWeek < monthState.maxWeek,
+    onClick = { monthState.currentWeek = monthState.currentWeek.inc() }
+  ) {
+    Image(
+      imageVector = Icons.Default.KeyboardArrowRight,
+      colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
+      contentDescription = "Next",
+    )
+  }
+}
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt
index c03f12a..f1ad44b 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/MonthState.kt
@@ -4,31 +4,38 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.setValue
 import org.threeten.bp.YearMonth
 
 @Suppress("FunctionName") // Factory function
 public fun MonthState(
   initialMonth: YearMonth,
-  previousMonth: YearMonth = initialMonth,
-): MonthState = MonthStateImpl(initialMonth, previousMonth)
+  minMonth: YearMonth,
+  maxMonth: YearMonth,
+): MonthState = MonthStateImpl(initialMonth, minMonth, maxMonth)
 
 @Stable
 public interface MonthState {
   public var currentMonth: YearMonth
-
-  public fun getPreviousMonth(): YearMonth
+  public var minMonth: YearMonth
+  public var maxMonth: YearMonth
 
   public companion object {
     @Suppress("FunctionName") // Factory function
-    public fun Saver(): Saver<MonthState, String> = Saver(
-      save = {
-        it.currentMonth.toString() + "##" + it.getPreviousMonth().toString()
+    public fun Saver(): Saver<MonthState, Any> = mapSaver(
+      save = { monthState ->
+        mapOf(
+          "currentMonth" to monthState.currentMonth.toString(),
+          "minMonth" to monthState.minMonth.toString(),
+          "maxMonth" to monthState.maxMonth.toString(),
+        )
       },
-      restore = {
+      restore = { restoreMap ->
         MonthState(
-          YearMonth.parse(it.split("##").first()),
-          YearMonth.parse(it.split("##").last())
+          YearMonth.parse(restoreMap["currentMonth"] as String),
+          YearMonth.parse(restoreMap["minMonth"] as String),
+          YearMonth.parse(restoreMap["maxMonth"] as String),
         )
       }
     )
@@ -38,21 +45,31 @@ public interface MonthState {
 @Stable
 private class MonthStateImpl(
   initialMonth: YearMonth,
-  previousMonth: YearMonth,
+  minMonth: YearMonth,
+  maxMonth: YearMonth,
 ) : MonthState {
 
-  private var _currentMonth by mutableStateOf<YearMonth>(initialMonth)
-
-  private var _previousMonth: YearMonth = previousMonth
+  private var _currentMonth by mutableStateOf(initialMonth)
+  private var _minMonth by mutableStateOf(minMonth)
+  private var _maxMonth by mutableStateOf(maxMonth)
 
   override var currentMonth: YearMonth
     get() = _currentMonth
     set(value) {
-      _previousMonth = currentMonth
       _currentMonth = value
     }
 
-  override fun getPreviousMonth(): YearMonth {
-    return _previousMonth
-  }
+  override var minMonth: YearMonth
+    get() = _minMonth
+    set(value) {
+      if (value > _maxMonth) return
+      _minMonth = value
+    }
+
+  override var maxMonth: YearMonth
+    get() = _maxMonth
+    set(value) {
+      if (value < _minMonth) return
+      _maxMonth = value
+    }
 }
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt
new file mode 100644
index 0000000..0976501
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt
@@ -0,0 +1,84 @@
+package io.github.boguszpawlowski.composecalendar.header
+
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.mapSaver
+import androidx.compose.runtime.setValue
+import io.github.boguszpawlowski.composecalendar.week.Week
+import org.threeten.bp.LocalDate
+
+@Suppress("FunctionName") // Factory function
+public fun WeekState(
+  initialWeek: Week,
+  minWeek: Week,
+  maxWeek: Week,
+): WeekState = WeekStateImpl(
+  initialWeek = initialWeek,
+  minWeek = minWeek,
+  maxWeek = maxWeek,
+)
+
+@Stable
+public interface WeekState {
+  public var currentWeek: Week
+  public var minWeek: Week
+  public var maxWeek: Week
+
+  public companion object {
+    @Suppress("FunctionName") // Factory function
+    public fun Saver(): Saver<WeekState, Any> = mapSaver(
+      save = { weekState ->
+        mapOf(
+          CurrentWeekKey to weekState.currentWeek.toString(),
+          MinWeekKey to weekState.minWeek.toString(),
+          MaxWeekKey to weekState.maxWeek.toString(),
+        )
+      },
+      restore = { restoreMap ->
+        WeekState(
+          initialWeek = Week(firstDay = LocalDate.parse(restoreMap[CurrentWeekKey] as String)),
+          minWeek = Week(firstDay = LocalDate.parse(restoreMap[MinWeekKey] as String)),
+          maxWeek = Week(firstDay = LocalDate.parse(restoreMap[MaxWeekKey] as String)),
+        )
+      }
+    )
+
+    private const val CurrentWeekKey = "CurrentWeek"
+    private const val MinWeekKey = "MinWeek"
+    private const val MaxWeekKey = "MaxWeek"
+  }
+}
+
+@Stable
+private class WeekStateImpl(
+  initialWeek: Week,
+  minWeek: Week,
+  maxWeek: Week,
+) : WeekState {
+
+  private var _currentWeek by mutableStateOf(initialWeek)
+  private var _minWeek by mutableStateOf(minWeek)
+  private var _maxWeek by mutableStateOf(maxWeek)
+
+  override var currentWeek: Week
+    get() = _currentWeek
+    set(value) {
+      _currentWeek = value
+    }
+
+  override var minWeek: Week
+    get() = _minWeek
+    set(value) {
+      if (value > _maxWeek) return
+      _minWeek = value
+    }
+
+  override var maxWeek: Week
+    get() = _maxWeek
+    set(value) {
+      if (value < _minWeek) return
+      _maxWeek = value
+    }
+}
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt
index 16a2b10..9ca5668 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt
@@ -26,13 +26,12 @@ import dev.chrisbanes.snapper.rememberSnapperFlingBehavior
 import io.github.boguszpawlowski.composecalendar.day.DayState
 import io.github.boguszpawlowski.composecalendar.header.MonthState
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
-import io.github.boguszpawlowski.composecalendar.week.WeekContent
+import io.github.boguszpawlowski.composecalendar.week.WeekRow
 import io.github.boguszpawlowski.composecalendar.week.getWeeks
 import org.threeten.bp.DayOfWeek
 import org.threeten.bp.LocalDate
 import org.threeten.bp.YearMonth
-
-internal const val DaysOfWeek = 7
+import org.threeten.bp.temporal.ChronoUnit
 
 @OptIn(ExperimentalSnapperApi::class)
 @Composable
@@ -46,14 +45,18 @@ internal fun <T : SelectionState> MonthPager(
   daysOfWeek: List<DayOfWeek>,
   today: LocalDate,
   modifier: Modifier = Modifier,
+  weekDaysScrollEnabled: Boolean = true,
   dayContent: @Composable BoxScope.(DayState<T>) -> Unit,
   weekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit,
   monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit,
 ) {
   val coroutineScope = rememberCoroutineScope()
 
+  val initialFirstVisibleItemIndex = remember(initialMonth, monthState.minMonth) {
+    ChronoUnit.MONTHS.between(monthState.minMonth, initialMonth).toInt()
+  }
   val listState = rememberLazyListState(
-    initialFirstVisibleItemIndex = StartIndex,
+    initialFirstVisibleItemIndex = initialFirstVisibleItemIndex,
   )
   val flingBehavior = rememberSnapperFlingBehavior(
     lazyListState = listState,
@@ -66,32 +69,50 @@ internal fun <T : SelectionState> MonthPager(
   val monthListState = remember {
     MonthListState(
       coroutineScope = coroutineScope,
-      initialMonth = initialMonth,
       monthState = monthState,
       listState = listState,
     )
   }
 
-  LazyRow(
-    modifier = modifier.testTag("MonthPager"),
-    state = listState,
-    flingBehavior = flingBehavior,
-    verticalAlignment = Alignment.Top,
-  ) {
-    items(PagerItemCount) { index ->
-      MonthContent(
-        isFullScreen = isFullScreen,
-        modifier = Modifier.fillParentMaxWidth(),
-        showAdjacentMonths = showAdjacentMonths,
-        selectionState = selectionState,
-        currentMonth = monthListState.getMonthForPage(index),
-        today = today,
-        daysOfWeek = daysOfWeek,
-        dayContent = dayContent,
-        weekHeader = weekHeader,
-        monthContainer = monthContainer
+  Column(modifier = Modifier.fillMaxWidth()) {
+    if (weekDaysScrollEnabled.not()) {
+      Box(
+        modifier = Modifier
+          .wrapContentHeight()
+          .fillMaxWidth(),
+        content = { weekHeader(daysOfWeek) },
       )
     }
+    val pagerCount = remember(monthState.minMonth, monthState.maxMonth) {
+      ChronoUnit.MONTHS.between(monthState.minMonth, monthState.maxMonth).toInt() + 1
+    }
+    LazyRow(
+      modifier = modifier.testTag("MonthPager"),
+      state = listState,
+      flingBehavior = flingBehavior,
+      verticalAlignment = Alignment.Top,
+    ) {
+      items(
+        count = pagerCount,
+        key = { index ->
+          monthListState.getMonthForPage(index).let { "${it.year}-${it.monthValue}" }
+        }
+      ) { index ->
+        MonthContent(
+          isFullScreen = isFullScreen,
+          modifier = Modifier.fillParentMaxWidth(),
+          showAdjacentMonths = showAdjacentMonths,
+          selectionState = selectionState,
+          currentMonth = monthListState.getMonthForPage(index),
+          today = today,
+          weekDaysScrollEnabled = weekDaysScrollEnabled,
+          daysOfWeek = daysOfWeek,
+          dayContent = dayContent,
+          weekHeader = weekHeader,
+          monthContainer = monthContainer
+        )
+      }
+    }
   }
 }
 
@@ -104,20 +125,22 @@ internal fun <T : SelectionState> MonthContent(
   daysOfWeek: List<DayOfWeek>,
   today: LocalDate,
   modifier: Modifier = Modifier,
+  weekDaysScrollEnabled: Boolean = true,
   dayContent: @Composable BoxScope.(DayState<T>) -> Unit,
   weekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit,
   monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit,
 ) {
   Column {
-    Box(
-      modifier = modifier
-        .wrapContentHeight(),
-      content = { weekHeader(daysOfWeek) },
-    )
-
+    if (weekDaysScrollEnabled) {
+      Box(
+        modifier = modifier
+          .wrapContentHeight(),
+        content = { weekHeader(daysOfWeek) },
+      )
+    }
     monthContainer { paddingValues ->
       Column(
-        modifier = if(!isFullScreen) {
+        modifier = if (!isFullScreen) {
           modifier.wrapContentWidth()
         } else {
           modifier.fillMaxHeight()
@@ -128,16 +151,16 @@ internal fun <T : SelectionState> MonthContent(
           firstDayOfTheWeek = daysOfWeek.first(),
           today = today,
         ).forEach { week ->
-          WeekContent(
+          WeekRow(
             isFullScreen = isFullScreen,
-            modifier = if(!isFullScreen) {
+            weekDays = week,
+            selectionState = selectionState,
+            dayContent = dayContent,
+            modifier = if (!isFullScreen) {
               Modifier
             } else {
               Modifier.weight(1f)
             },
-            week = week,
-            selectionState = selectionState,
-            dayContent = dayContent,
           )
         }
       }
@@ -146,7 +169,7 @@ internal fun <T : SelectionState> MonthContent(
 }
 
 @OptIn(ExperimentalSnapperApi::class)
-private val coerceSnapIndex: (SnapperLayoutInfo, startIndex: Int, targetIndex: Int) -> Int =
+internal val coerceSnapIndex: (SnapperLayoutInfo, startIndex: Int, targetIndex: Int) -> Int =
   { _, startIndex, targetIndex ->
     targetIndex
       .coerceIn(startIndex - 1, startIndex + 1)
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt
index a5195f4..7feef1e 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.snapshotFlow
 import io.github.boguszpawlowski.composecalendar.header.MonthState
+import io.github.boguszpawlowski.composecalendar.util.throttleOnOffset
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -16,12 +17,11 @@ import org.threeten.bp.temporal.ChronoUnit
 @Stable
 internal class MonthListState(
   private val coroutineScope: CoroutineScope,
-  private val initialMonth: YearMonth,
   private val monthState: MonthState,
   private val listState: LazyListState,
 ) {
 
-  private val currentlyVisibleMonth by derivedStateOf {
+  private val currentFirstVisibleMonth by derivedStateOf {
     getMonthForPage(listState.firstVisibleItemIndex)
   }
 
@@ -30,20 +30,22 @@ internal class MonthListState(
       moveToMonth(month)
     }.launchIn(coroutineScope)
 
-    snapshotFlow { currentlyVisibleMonth }.onEach { newMonth ->
-      monthState.currentMonth = newMonth
-    }.launchIn(coroutineScope)
+    with(listState) {
+      snapshotFlow { currentFirstVisibleMonth }
+        .throttleOnOffset()
+        .onEach { newMonth ->
+          monthState.currentMonth = newMonth
+        }.launchIn(coroutineScope)
+    }
   }
 
   fun getMonthForPage(index: Int): YearMonth =
-    initialMonth.plusMonths((index - StartIndex).toLong())
+    monthState.minMonth.plusMonths(index.toLong())
 
-  private fun moveToMonth(month: YearMonth) {
-    if (month == currentlyVisibleMonth) return
-    initialMonth.minus(month).let { offset ->
-      coroutineScope.launch {
-        listState.animateScrollToItem((StartIndex - offset).toInt())
-      }
+  private fun moveToMonth(month:  YearMonth) {
+    if (month == currentFirstVisibleMonth) return
+    coroutineScope.launch {
+      listState.animateScrollToItem(ChronoUnit.MONTHS.between(monthState.minMonth, month).toInt())
     }
   }
 
@@ -68,6 +70,3 @@ internal class MonthListState(
 
 private operator fun YearMonth.minus(other: YearMonth) =
   ChronoUnit.MONTHS.between(other, this)
-
-internal const val PagerItemCount = 20_000
-internal const val StartIndex = PagerItemCount / 2
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionMode.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionMode.kt
index a75b339..7a1aeee 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionMode.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionMode.kt
@@ -12,5 +12,4 @@ public enum class SelectionMode {
   Single,
   Multiple,
   Period,
-  ;
 }
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt
new file mode 100644
index 0000000..07c576d
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt
@@ -0,0 +1,19 @@
+package io.github.boguszpawlowski.composecalendar.util
+
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.snapshotFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+
+context(LazyListState) internal fun <T> Flow<T>.throttleOnOffset() =
+  combine(
+    snapshotFlow { firstVisibleItemScrollOffset }
+  ) { newMonth, offset ->
+    newMonth to (offset <= MinimalOffsetForEmit)
+  }.filter { (_, shouldUpdate) ->
+    shouldUpdate
+  }.map { (newValue, _) -> newValue }
+
+private const val MinimalOffsetForEmit = 10
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt
index ab6a2cd..5152506 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt
@@ -9,8 +9,17 @@ import androidx.compose.ui.text.style.TextAlign
 import org.threeten.bp.DayOfWeek
 import org.threeten.bp.format.TextStyle.SHORT
 import java.util.Locale
+import kotlin.DeprecationLevel.WARNING
 
 @Composable
+@Deprecated(
+  level = WARNING,
+  replaceWith = ReplaceWith(
+    "DefaultDaysOfWeekHeader(daysOfWeek, modifier)",
+    "io.github.boguszpawlowski.composecalendar.week.DefaultDaysOfWeekHeader",
+  ),
+  message = "Replace with DefaultDaysOfWeekHeader, DefaultWeekHeader will be removed in future versions"
+)
 public fun DefaultWeekHeader(
   daysOfWeek: List<DayOfWeek>,
   modifier: Modifier = Modifier,
@@ -28,4 +37,22 @@ public fun DefaultWeekHeader(
   }
 }
 
+@Composable
+public fun DefaultDaysOfWeekHeader(
+  daysOfWeek: List<DayOfWeek>,
+  modifier: Modifier = Modifier,
+) {
+  Row(modifier = modifier) {
+    daysOfWeek.forEach { dayOfWeek ->
+      Text(
+        textAlign = TextAlign.Center,
+        text = dayOfWeek.getDisplayName(SHORT, Locale.getDefault()),
+        modifier = modifier
+          .weight(1f)
+          .wrapContentHeight()
+      )
+    }
+  }
+}
+
 internal fun <T> Array<T>.rotateRight(n: Int): List<T> = takeLast(n) + dropLast(n)
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt
index 4f65525..a1f3ec6 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt
@@ -1,10 +1,52 @@
 package io.github.boguszpawlowski.composecalendar.week
 
-import androidx.compose.runtime.Immutable
-import io.github.boguszpawlowski.composecalendar.day.Day
-
-@Immutable
-internal data class Week(
-  val isFirstWeekOfTheMonth: Boolean = false,
-  val days: List<Day>,
-)
+import io.github.boguszpawlowski.composecalendar.selection.fillUpTo
+import io.github.boguszpawlowski.composecalendar.util.daysUntil
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
+import org.threeten.bp.temporal.ChronoUnit
+import org.threeten.bp.temporal.WeekFields
+import java.util.Locale
+
+public data class Week(
+  val days: List<LocalDate>,
+) {
+
+  init {
+    require(days.size == DaysInAWeek)
+  }
+
+  internal constructor(firstDay: LocalDate) : this(
+    listOf(firstDay).fillUpTo(firstDay.plusDays((DaysInAWeek - 1).toLong()))
+  )
+
+  public val start: LocalDate get() = days.first()
+
+  public val end: LocalDate get() = days.last()
+
+  public val yearMonth: YearMonth = YearMonth.of(start.year, start.month)
+
+  public operator fun inc(): Week = plusWeeks(1)
+
+  public operator fun dec(): Week = plusWeeks(-1)
+
+  public operator fun compareTo(other: Week): Int = start.compareTo(other.start)
+
+  public fun minusWeeks(value: Long): Week = plusWeeks(-value)
+
+  public fun plusWeeks(value: Long): Week = copy(days = days.map { it.plusWeeks(value) })
+
+  public companion object {
+    public fun now(firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek): Week {
+      val today = LocalDate.now()
+      val offset = today.dayOfWeek.daysUntil(firstDayOfWeek)
+      val firstDay = today.minusDays(offset.toLong())
+
+      return Week(firstDay)
+    }
+  }
+}
+
+public fun ChronoUnit.between(first: Week, other: Week): Int =
+  between(first.start, other.start).toInt()
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt
new file mode 100644
index 0000000..374e175
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt
@@ -0,0 +1,10 @@
+package io.github.boguszpawlowski.composecalendar.week
+
+import androidx.compose.runtime.Immutable
+import io.github.boguszpawlowski.composecalendar.day.Day
+
+@Immutable
+internal data class WeekDays(
+  val isFirstWeekOfTheMonth: Boolean = false,
+  val days: List<Day>,
+)
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt
new file mode 100644
index 0000000..6695c22
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt
@@ -0,0 +1,68 @@
+package io.github.boguszpawlowski.composecalendar.week
+
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.snapshotFlow
+import io.github.boguszpawlowski.composecalendar.header.WeekState
+import io.github.boguszpawlowski.composecalendar.util.throttleOnOffset
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import org.threeten.bp.temporal.ChronoUnit
+
+@Stable
+internal class WeekListState(
+  private val coroutineScope: CoroutineScope,
+  private val weekState: WeekState,
+  private val listState: LazyListState,
+) {
+
+  private val currentlyFirstVisibleMonth by derivedStateOf {
+    getWeekForPage(listState.firstVisibleItemIndex)
+  }
+
+  init {
+    snapshotFlow { weekState.currentWeek }.onEach { week ->
+      moveToWeek(week)
+    }.launchIn(coroutineScope)
+
+    with(listState) {
+      snapshotFlow { currentlyFirstVisibleMonth }
+        .throttleOnOffset()
+        .onEach { newMonth ->
+          weekState.currentWeek = newMonth
+        }.launchIn(coroutineScope)
+    }
+  }
+
+  fun getWeekForPage(index: Int): Week =
+    weekState.minWeek.plusWeeks(index.toLong())
+
+  private fun moveToWeek(week: Week) {
+    if (week == currentlyFirstVisibleMonth) return
+    coroutineScope.launch {
+      listState.animateScrollToItem(ChronoUnit.WEEKS.between(weekState.minWeek, week))
+    }
+  }
+
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (javaClass != other?.javaClass) return false
+
+    other as WeekListState
+
+    if (weekState != other.weekState) return false
+    if (listState != other.listState) return false
+
+    return true
+  }
+
+  override fun hashCode(): Int {
+    var result = weekState.hashCode()
+    result = 31 * result + listState.hashCode()
+    return result
+  }
+}
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt
new file mode 100644
index 0000000..7bd456b
--- /dev/null
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt
@@ -0,0 +1,150 @@
+package io.github.boguszpawlowski.composecalendar.week
+
+import androidx.compose.animation.rememberSplineBasedDecay
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import dev.chrisbanes.snapper.ExperimentalSnapperApi
+import dev.chrisbanes.snapper.SnapOffsets
+import dev.chrisbanes.snapper.SnapperFlingBehaviorDefaults
+import dev.chrisbanes.snapper.rememberSnapperFlingBehavior
+import io.github.boguszpawlowski.composecalendar.day.DayState
+import io.github.boguszpawlowski.composecalendar.day.WeekDay
+import io.github.boguszpawlowski.composecalendar.header.WeekState
+import io.github.boguszpawlowski.composecalendar.month.coerceSnapIndex
+import io.github.boguszpawlowski.composecalendar.selection.SelectionState
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
+import org.threeten.bp.temporal.ChronoUnit
+
+@OptIn(ExperimentalSnapperApi::class)
+@Composable
+@Suppress("LongMethod")
+internal fun <T : SelectionState> WeekPager(
+  initialWeek: Week,
+  selectionState: T,
+  weekState: WeekState,
+  daysOfWeek: List<DayOfWeek>,
+  today: LocalDate,
+  modifier: Modifier = Modifier,
+  weekDaysScrollEnabled: Boolean = true,
+  dayContent: @Composable BoxScope.(DayState<T>) -> Unit,
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit,
+) {
+  val coroutineScope = rememberCoroutineScope()
+
+  val initialFirstVisibleItemIndex = remember(initialWeek, weekState.minWeek) {
+    ChronoUnit.WEEKS.between(weekState.minWeek, initialWeek)
+  }
+  val listState = rememberLazyListState(
+    initialFirstVisibleItemIndex = initialFirstVisibleItemIndex,
+  )
+  val flingBehavior = rememberSnapperFlingBehavior(
+    lazyListState = listState,
+    snapOffsetForItem = SnapOffsets.Start,
+    springAnimationSpec = SnapperFlingBehaviorDefaults.SpringAnimationSpec,
+    decayAnimationSpec = rememberSplineBasedDecay(),
+    snapIndex = coerceSnapIndex,
+  )
+
+  val weekListState = remember {
+    WeekListState(
+      coroutineScope = coroutineScope,
+      weekState = weekState,
+      listState = listState,
+    )
+  }
+  Column(
+    modifier = modifier,
+  ) {
+    if (weekDaysScrollEnabled.not()) {
+      Box(
+        modifier = Modifier
+          .wrapContentHeight()
+          .fillMaxWidth(),
+        content = { daysOfWeekHeader(daysOfWeek) },
+      )
+    }
+    val pagerCount = remember(weekState.minWeek, weekState.maxWeek) {
+      ChronoUnit.WEEKS.between(weekState.minWeek, weekState.maxWeek) + 1
+    }
+    LazyRow(
+      modifier = modifier.testTag("WeekPager"),
+      state = listState,
+      flingBehavior = flingBehavior,
+      verticalAlignment = Alignment.Top,
+    ) {
+      items(
+        count = pagerCount,
+        key = { index -> weekListState.getWeekForPage(index).start.let { "${it.month}-${it.dayOfMonth}" } },
+      ) { index ->
+        WeekContent(
+          modifier = Modifier.fillParentMaxWidth(),
+          daysOfWeek = daysOfWeek,
+          weekDays = weekListState.getWeekForPage(index).getWeekDays(today = today),
+          selectionState = selectionState,
+          weekDaysScrollEnabled = weekDaysScrollEnabled,
+          dayContent = dayContent,
+          daysOfWeekHeader = daysOfWeekHeader,
+        )
+      }
+    }
+  }
+}
+
+@Composable
+internal fun <T : SelectionState> WeekContent(
+  selectionState: T,
+  weekDays: WeekDays,
+  daysOfWeek: List<DayOfWeek>,
+  modifier: Modifier = Modifier,
+  isFullScreen: Boolean = false,
+  weekDaysScrollEnabled: Boolean = true,
+  dayContent: @Composable BoxScope.(DayState<T>) -> Unit,
+  daysOfWeekHeader: @Composable BoxScope.(List<DayOfWeek>) -> Unit,
+) {
+  Column(
+    modifier = modifier,
+  ) {
+    if (weekDaysScrollEnabled) {
+      Box(
+        modifier = Modifier
+          .wrapContentHeight()
+          .fillMaxWidth(),
+        content = { daysOfWeekHeader(daysOfWeek) },
+      )
+    }
+    WeekRow(
+      weekDays = weekDays,
+      modifier = Modifier.fillMaxWidth(),
+      selectionState = selectionState,
+      dayContent = dayContent,
+      isFullScreen = isFullScreen
+    )
+  }
+}
+
+internal fun Week.getWeekDays(today: LocalDate): WeekDays {
+  val weekDays = days.map {
+    WeekDay(
+      date = it,
+      isCurrentDay = it == today,
+      isFromCurrentMonth = true,
+    )
+  }
+
+  return WeekDays(
+    isFirstWeekOfTheMonth = false,
+    days = weekDays,
+  )
+}
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekRow.kt
similarity index 83%
rename from library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekContent.kt
rename to library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekRow.kt
index af822e2..0562ea0 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekContent.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekRow.kt
@@ -13,9 +13,9 @@ import io.github.boguszpawlowski.composecalendar.day.DayState
 import io.github.boguszpawlowski.composecalendar.selection.SelectionState
 
 @Composable
-internal fun <T : SelectionState> WeekContent(
+internal fun <T : SelectionState> WeekRow(
   isFullScreen: Boolean,
-  week: Week,
+  weekDays: WeekDays,
   selectionState: T,
   modifier: Modifier = Modifier,
   dayContent: @Composable BoxScope.(DayState<T>) -> Unit,
@@ -29,9 +29,9 @@ internal fun <T : SelectionState> WeekContent(
       modifier
         .fillMaxSize()
     },
-    horizontalArrangement = if (week.isFirstWeekOfTheMonth) Arrangement.End else Arrangement.Start
+    horizontalArrangement = if (weekDays.isFirstWeekOfTheMonth) Arrangement.End else Arrangement.Start
   ) {
-    week.days.forEachIndexed { index, day ->
+    weekDays.days.forEachIndexed { index, day ->
       Box(
         modifier = Modifier.fillMaxWidth(1f / (7 - index))
       ) {
diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt
index 5d34fad..3a00da6 100644
--- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt
+++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt
@@ -6,13 +6,13 @@ import org.threeten.bp.DayOfWeek
 import org.threeten.bp.LocalDate
 import org.threeten.bp.YearMonth
 
-private const val DaysInAWeek = 7
+internal const val DaysInAWeek = 7
 
 internal fun YearMonth.getWeeks(
   includeAdjacentMonths: Boolean,
   firstDayOfTheWeek: DayOfWeek,
   today: LocalDate = LocalDate.now(),
-): List<Week> {
+): List<WeekDays> {
   val daysLength = lengthOfMonth()
 
   val starOffset = atDay(1).dayOfWeek daysUntil firstDayOfTheWeek
@@ -20,7 +20,7 @@ internal fun YearMonth.getWeeks(
     DaysInAWeek - (atDay(daysLength).dayOfWeek daysUntil firstDayOfTheWeek) - 1
 
   return (1 - starOffset..daysLength + endOffset).chunked(DaysInAWeek).mapIndexed { index, days ->
-    Week(
+    WeekDays(
       isFirstWeekOfTheMonth = index == 0,
       days = days.mapNotNull { dayOfMonth ->
         val (date, isFromCurrentMonth) = when (dayOfMonth) {
diff --git a/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt b/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt
new file mode 100644
index 0000000..96203c6
--- /dev/null
+++ b/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt
@@ -0,0 +1,68 @@
+package io.github.boguszpawlowski.composecalendar.week
+
+import io.kotest.assertions.asClue
+import io.kotest.assertions.throwables.shouldThrow
+import io.kotest.core.spec.style.ShouldSpec
+import io.kotest.matchers.shouldBe
+import org.threeten.bp.LocalDate
+
+internal class WeekTest : ShouldSpec({
+
+  val today = LocalDate.of(2000, 10, 2)
+
+  context("Secondary constructor") {
+    val week = Week(firstDay = today)
+
+    should("properly create an instance of week") {
+      week.asClue {
+        it.days.first() shouldBe today
+        it.days.last() shouldBe today.plusDays(6)
+        it.days.size shouldBe 7
+      }
+    }
+  }
+
+  context("Incrementing") {
+    val week = Week(firstDay = today).inc()
+
+    should("shift the days by 7") {
+      week.asClue {
+        it.days.first() shouldBe today.plusWeeks(1)
+        it.days.last() shouldBe today.plusDays(6).plusWeeks(1)
+        it.days.size shouldBe 7
+      }
+    }
+  }
+
+  context("Decrementing") {
+    val week = Week(firstDay = today).dec()
+
+    should("shift the days by -7") {
+      week.asClue {
+        it.days.first() shouldBe today.plusWeeks(-1)
+        it.days.last() shouldBe today.plusDays(6).plusWeeks(-1)
+        it.days.size shouldBe 7
+      }
+    }
+  }
+
+  context("Adding a week") {
+    val week = Week(firstDay = today).plusWeeks(7)
+
+    should("add correct number of days") {
+      week.asClue {
+        it.days.first() shouldBe today.plusWeeks(7)
+        it.days.last() shouldBe today.plusDays(6).plusWeeks(7)
+        it.days.size shouldBe 7
+      }
+    }
+  }
+
+  context("Constructing a week with invalid number of days") {
+    should("throw") {
+      shouldThrow<IllegalArgumentException> {
+        Week(List(18) { LocalDate.now() })
+      }
+    }
+  }
+})
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 9779867..845f9f1 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 //val commitsCount = Grgit.open(mapOf("dir" to rootDir)).log().size
 
 android {
+  namespace = "com.boguszpawlowski.composecalendar"
   defaultConfig {
     versionCode = 1
     versionName = "0.0.1"
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 49f92d1..9253b3b 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.boguszpawlowski.composecalendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
 
 
     <application
-        android:name=".sample.CalendarApplication"
+        android:name="io.github.boguszpawlowski.composecalendar.sample.CalendarApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt
index 6e38d2a..c83137c 100644
--- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt
+++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt
@@ -38,7 +38,7 @@ fun CustomComponentsSample() {
     firstDayOfWeek = SUNDAY,
     monthContainer = { MonthContainer(it) },
     dayContent = { DayContent(dayState = it) },
-    weekHeader = { WeekHeader(daysOfWeek = it) },
+    daysOfWeekHeader = { WeekHeader(daysOfWeek = it) },
     monthHeader = { MonthHeader(monthState = it) },
   )
 }
diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt
index f320f28..2b8ca42 100644
--- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt
+++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt
@@ -47,9 +47,15 @@ private class MonthSelectionState(
 @Composable
 private fun rememberMonthSelectionState(
   initialMonth: YearMonth = YearMonth.now(),
+  minMonth: YearMonth = initialMonth.minusMonths(10000),
+  maxMonth: YearMonth = initialMonth.plusMonths(10000),
   initialSelection: YearMonth? = null,
   monthState: MonthState = rememberSaveable(saver = MonthState.Saver()) {
-    MonthState(initialMonth = initialMonth)
+    MonthState(
+      initialMonth = initialMonth,
+      minMonth = minMonth,
+      maxMonth = maxMonth
+    )
   },
   selectionState: MonthSelectionState = rememberSaveable(saver = MonthSelectionState.Saver()) {
     MonthSelectionState(initialSelection = initialSelection)
diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt
index 5dc12a9..d30eaae 100644
--- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt
+++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt
@@ -23,16 +23,10 @@ import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import io.github.boguszpawlowski.composecalendar.BuildConfig
-import timber.log.Timber
-import timber.log.Timber.DebugTree
 
 class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    if (BuildConfig.DEBUG) {
-      Timber.plant(DebugTree())
-    }
     setContent {
       MainScreen()
     }
@@ -52,11 +46,13 @@ fun MainScreen() {
       NavHost(navController = navController, startDestination = "main") {
         composable("main") { MainMenu(navController = navController) }
         composable("static") { StaticCalendarSample() }
+        composable("week") { WeekCalendarSample() }
         composable("selection") { SelectableCalendarSample() }
         composable("components") { CustomComponentsSample() }
         composable("custom_selection") { CustomSelectionSample() }
         composable("viewmodel") { ViewModelSample() }
 //        composable("kotlinx_datetime") { KotlinXDateTimeSample() }
+        composable("min_max_month") { MinMaxCalendarSample() }
       }
     }
   }
@@ -79,6 +75,11 @@ fun MainMenu(navController: NavController) {
     }
     Spacer(modifier = Modifier.height(16.dp))
 
+    Button(onClick = { navController.navigate("week") }) {
+      Text(text = "Week Calendar")
+    }
+    Spacer(modifier = Modifier.height(16.dp))
+
     Button(onClick = { navController.navigate("components") }) {
       Text(text = "Custom Components")
     }
@@ -97,5 +98,10 @@ fun MainMenu(navController: NavController) {
     Button(onClick = { navController.navigate("kotlinx_datetime") }) {
       Text(text = "Kotlinx DateTime")
     }
+    Spacer(modifier = Modifier.height(16.dp))
+
+    Button(onClick = { navController.navigate("min_max_month") }) {
+      Text(text = "Min Max Month")
+    }
   }
 }
diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MinMaxCalendarSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MinMaxCalendarSample.kt
new file mode 100644
index 0000000..8102625
--- /dev/null
+++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MinMaxCalendarSample.kt
@@ -0,0 +1,268 @@
+package io.github.boguszpawlowski.composecalendar.sample
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import io.github.boguszpawlowski.composecalendar.CalendarState
+import io.github.boguszpawlowski.composecalendar.StaticCalendar
+import io.github.boguszpawlowski.composecalendar.StaticWeekCalendar
+import io.github.boguszpawlowski.composecalendar.WeekCalendarState
+import io.github.boguszpawlowski.composecalendar.rememberCalendarState
+import io.github.boguszpawlowski.composecalendar.rememberWeekCalendarState
+import io.github.boguszpawlowski.composecalendar.selection.EmptySelectionState
+import io.github.boguszpawlowski.composecalendar.week.Week
+import org.threeten.bp.YearMonth
+import org.threeten.bp.format.DateTimeFormatter
+
+@Composable
+fun MinMaxCalendarSample() {
+  val calendarState = rememberCalendarState(
+    initialMonth = YearMonth.now(),
+    minMonth = YearMonth.now(),
+    maxMonth = YearMonth.now()
+  )
+
+  val weekCalendarState = rememberWeekCalendarState(
+    initialWeek = Week.now(),
+    minWeek = Week.now(),
+    maxWeek = Week.now(),
+  )
+
+  Column(
+    Modifier
+      .fillMaxSize()
+      .verticalScroll(rememberScrollState())
+  ) {
+    StaticCalendar(calendarState = calendarState)
+
+    Spacer(modifier = Modifier.height(20.dp))
+
+    MinMaxControls(calendarState = calendarState)
+
+    Spacer(modifier = Modifier.height(40.dp))
+
+    StaticWeekCalendar(calendarState = weekCalendarState)
+
+    Spacer(modifier = Modifier.height(20.dp))
+
+    WeekMinMaxControls(calendarState = weekCalendarState)
+  }
+}
+
+@Composable
+private fun MinMaxControls(
+  calendarState: CalendarState<EmptySelectionState>,
+) {
+  val dateFormatter = remember { DateTimeFormatter.ofPattern("yyyy-MM") }
+  Text(
+    text = "Calendar Min Month",
+    style = MaterialTheme.typography.h5,
+  )
+  MinControls(
+    calendarState = calendarState,
+    dateFormatter = dateFormatter
+  )
+  Spacer(modifier = Modifier.height(20.dp))
+  Text(
+    text = "Calendar Max Month",
+    style = MaterialTheme.typography.h5,
+  )
+  MaxControls(
+    calendarState = calendarState,
+    dateFormatter = dateFormatter
+  )
+}
+
+@Composable
+private fun MinControls(
+  calendarState: CalendarState<EmptySelectionState>,
+  dateFormatter: DateTimeFormatter,
+) {
+  Row(
+    modifier = Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.spacedBy(5.dp),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.monthState.minMonth = calendarState.monthState.minMonth.minusMonths(1L)
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "-",
+      textAlign = TextAlign.Center
+    )
+    val minYearMonthText = remember(calendarState.monthState.minMonth) {
+      dateFormatter.format(calendarState.monthState.minMonth)
+    }
+    Text(text = minYearMonthText)
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.monthState.minMonth = calendarState.monthState.minMonth.plusMonths(1L)
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "+",
+      textAlign = TextAlign.Center
+    )
+  }
+}
+
+@Composable
+private fun MaxControls(
+  calendarState: CalendarState<EmptySelectionState>,
+  dateFormatter: DateTimeFormatter,
+) {
+  Row(
+    modifier = Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.spacedBy(5.dp),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.monthState.maxMonth = calendarState.monthState.maxMonth.minusMonths(1L)
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "-",
+      textAlign = TextAlign.Center
+    )
+    val maxYearMonthText = remember(calendarState.monthState.maxMonth) {
+      dateFormatter.format(calendarState.monthState.maxMonth)
+    }
+    Text(text = maxYearMonthText)
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.monthState.maxMonth = calendarState.monthState.maxMonth.plusMonths(1L)
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "+",
+      textAlign = TextAlign.Center
+    )
+  }
+}
+
+@Composable
+private fun WeekMinMaxControls(
+  calendarState: WeekCalendarState<EmptySelectionState>,
+) {
+  val dateFormatter = remember { DateTimeFormatter.ofPattern("yyyy-MM-dd") }
+  Text(
+    text = "Calendar Min Week",
+    style = MaterialTheme.typography.h5,
+  )
+  WeekMinControls(
+    calendarState = calendarState,
+    dateFormatter = dateFormatter
+  )
+  Spacer(modifier = Modifier.height(20.dp))
+  Text(
+    text = "Calendar Max Week",
+    style = MaterialTheme.typography.h5,
+  )
+  WeekMaxControls(
+    calendarState = calendarState,
+    dateFormatter = dateFormatter
+  )
+}
+
+@Composable
+private fun WeekMinControls(
+  calendarState: WeekCalendarState<EmptySelectionState>,
+  dateFormatter: DateTimeFormatter,
+) {
+  Row(
+    modifier = Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.spacedBy(5.dp),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.weekState.minWeek = --calendarState.weekState.minWeek
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "-",
+      textAlign = TextAlign.Center
+    )
+    val minYearMonthText = remember(calendarState.weekState.minWeek) {
+      val start = dateFormatter.format(calendarState.weekState.minWeek.start)
+      val end = dateFormatter.format(calendarState.weekState.minWeek.end)
+      "$start - $end"
+    }
+    Text(text = minYearMonthText)
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.weekState.minWeek = ++calendarState.weekState.minWeek
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "+",
+      textAlign = TextAlign.Center
+    )
+  }
+}
+
+@Composable
+private fun WeekMaxControls(
+  calendarState: WeekCalendarState<EmptySelectionState>,
+  dateFormatter: DateTimeFormatter,
+) {
+  Row(
+    modifier = Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.spacedBy(5.dp),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.weekState.maxWeek = --calendarState.weekState.maxWeek
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "-",
+      textAlign = TextAlign.Center
+    )
+    val maxYearMonthText = remember(calendarState.weekState.maxWeek) {
+      val start = dateFormatter.format(calendarState.weekState.maxWeek.start)
+      val end = dateFormatter.format(calendarState.weekState.maxWeek.end)
+      "$start - $end"
+    }
+    Text(text = maxYearMonthText)
+    Text(
+      modifier = Modifier
+        .clickable {
+          calendarState.weekState.maxWeek = ++calendarState.weekState.maxWeek
+        }
+        .size(25.dp)
+        .border(1.dp, Color.Black),
+      text = "+",
+      textAlign = TextAlign.Center
+    )
+  }
+}
diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt
index 0f059be..a65d1a6 100644
--- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt
+++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt
@@ -5,10 +5,8 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -17,13 +15,15 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Card
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.RadioButton
 import androidx.compose.material.Text
 import androidx.compose.material.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -31,32 +31,48 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import io.github.boguszpawlowski.composecalendar.SelectableCalendar
 import io.github.boguszpawlowski.composecalendar.day.DayState
+import io.github.boguszpawlowski.composecalendar.header.MonthState
 import io.github.boguszpawlowski.composecalendar.rememberSelectableCalendarState
 import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState
-import io.github.boguszpawlowski.composecalendar.selection.SelectionMode
 import io.github.boguszpawlowski.composecalendar.selection.SelectionMode.Period
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlin.random.Random
+import kotlin.random.nextLong
 import org.threeten.bp.LocalDate
+import org.threeten.bp.YearMonth
 
 /**
  * In this sample, calendar composable is wired with an ViewModel. It's purpose is to show how to use
  * the composable in real world use-case, by an example implementation of a calendar
- * which can display planned recipes along with their prices
+ * which can display planned recipes along with their prices. The recipes will also be re-fetched from
+ * fake API every time month changes.
  */
 @Composable
 fun ViewModelSample() {
   val viewModel = remember { RecipeViewModel() }
   val recipes by viewModel.recipesFlow.collectAsState()
   val selectedPrice by viewModel.selectedRecipesPriceFlow.collectAsState(0)
-
+  val monthState = rememberMonthStateDefault()
+  LaunchedEffect(monthState) {
+    snapshotFlow { monthState.currentMonth }
+      .onEach { viewModel.onMonthChanged(it) }
+      .launchIn(this)
+  }
   val state = rememberSelectableCalendarState(
     confirmSelectionChange = { viewModel.onSelectionChanged(it); true },
+    monthState = monthState,
     initialSelectionMode = Period,
   )
-
   Column(
     Modifier.verticalScroll(rememberScrollState())
   ) {
@@ -69,17 +85,24 @@ fun ViewModelSample() {
         )
       }
     )
-
     Spacer(modifier = Modifier.height(20.dp))
     Text(
       text = "Selected recipes price: $selectedPrice",
       style = MaterialTheme.typography.h6,
     )
-
     Spacer(modifier = Modifier.height(20.dp))
   }
 }
 
+@Composable
+private fun rememberMonthStateDefault() = rememberSaveable(saver = MonthState.Saver()) {
+  MonthState(
+    initialMonth = YearMonth.now(),
+    minMonth = YearMonth.now().minusMonths(10000),
+    maxMonth = YearMonth.now().plusMonths(10000),
+  )
+}
+
 /**
  * Custom implementation of DayContent, which shows a dot if there is an recipe planned for this day.
  */
@@ -127,29 +150,6 @@ fun RecipeDay(
   }
 }
 
-/**
- * Enables for changing current selection mode.
- */
-@Composable
-private fun SelectionControls(
-  selectionState: DynamicSelectionState,
-) {
-  Text(
-    text = "Calendar Selection Mode",
-    style = MaterialTheme.typography.h6,
-  )
-  SelectionMode.values().forEach { selectionMode ->
-    Row(modifier = Modifier.fillMaxWidth()) {
-      RadioButton(
-        selected = selectionState.selectionMode == selectionMode,
-        onClick = { selectionState.selectionMode = selectionMode }
-      )
-      Text(text = selectionMode.name)
-      Spacer(modifier = Modifier.height(4.dp))
-    }
-  }
-}
-
 data class PlannedRecipe(
   val date: LocalDate,
   val price: Double,
@@ -161,14 +161,7 @@ data class PlannedRecipe(
 class RecipeViewModel : ViewModel() {
 
   private val selectionFlow = MutableStateFlow(emptyList<LocalDate>())
-  val recipesFlow = MutableStateFlow(
-    listOf(
-      PlannedRecipe(LocalDate.now().plusDays(1), 20.0),
-      PlannedRecipe(LocalDate.now().plusDays(3), 20.0),
-      PlannedRecipe(LocalDate.now().plusDays(5), 10.0),
-      PlannedRecipe(LocalDate.now().plusDays(-2), 25.0),
-    )
-  )
+  val recipesFlow = MutableStateFlow(getRecipes())
   val selectedRecipesPriceFlow = recipesFlow.combine(selectionFlow) { recipes, selection ->
     recipes.filter { it.date in selection }.sumOf { it.price }
   }
@@ -176,6 +169,25 @@ class RecipeViewModel : ViewModel() {
   fun onSelectionChanged(selection: List<LocalDate>) {
     selectionFlow.value = selection
   }
+
+  fun onMonthChanged(newMonth: YearMonth) = viewModelScope.launch {
+    recipesFlow.value = getRecipesFromApi(startingDay = newMonth.atDay(15))
+  }
+
+  private fun getRecipes(startingDay: LocalDate = LocalDate.now()) = listOf(
+    PlannedRecipe(startingDay.plusDays(Random.nextLong(1L..3L)), 20.0),
+    PlannedRecipe(startingDay.plusDays(Random.nextLong(4L..7L)), 20.0),
+    PlannedRecipe(startingDay.plusDays(Random.nextLong(8L..11L)), 10.0),
+    PlannedRecipe(startingDay.plusDays(Random.nextLong(-5L..-1L)), 25.0),
+  )
+
+  /**
+   * Simulated API call for new recipes
+   */
+  private suspend fun getRecipesFromApi(startingDay: LocalDate) = withContext(Dispatchers.Default) {
+    delay(100)
+    getRecipes(startingDay)
+  }
 }
 
 @Preview
diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt
new file mode 100644
index 0000000..9420be0
--- /dev/null
+++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt
@@ -0,0 +1,57 @@
+package io.github.boguszpawlowski.composecalendar.sample
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.RadioButton
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import io.github.boguszpawlowski.composecalendar.SelectableWeekCalendar
+import io.github.boguszpawlowski.composecalendar.rememberSelectableWeekCalendarState
+import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState
+import io.github.boguszpawlowski.composecalendar.selection.SelectionMode
+
+@Composable
+fun WeekCalendarSample() {
+  val calendarState = rememberSelectableWeekCalendarState()
+
+  Column(
+    Modifier.verticalScroll(rememberScrollState())
+  ) {
+    SelectableWeekCalendar(calendarState = calendarState)
+
+    SelectionControls(selectionState = calendarState.selectionState)
+  }
+}
+
+@Composable
+private fun SelectionControls(
+  selectionState: DynamicSelectionState,
+) {
+  Text(
+    text = "Calendar Selection Mode",
+    style = MaterialTheme.typography.h5,
+  )
+  SelectionMode.values().forEach { selectionMode ->
+    Row(modifier = Modifier.fillMaxWidth()) {
+      RadioButton(
+        selected = selectionState.selectionMode == selectionMode,
+        onClick = { selectionState.selectionMode = selectionMode }
+      )
+      Text(text = selectionMode.name)
+      Spacer(modifier = Modifier.height(4.dp))
+    }
+  }
+
+  Text(
+    text = "Selection: ${selectionState.selection.joinToString { it.toString() }}",
+    style = MaterialTheme.typography.h6,
+  )
+}