diff --git a/packages/documentation/Overview.vue b/packages/documentation/Overview.vue
index 813fe64..9a332e0 100644
--- a/packages/documentation/Overview.vue
+++ b/packages/documentation/Overview.vue
@@ -110,7 +110,8 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
                 <OfficeLabel>Test Layer!</OfficeLabel>
             </OfficeLayer>
 
-            <OfficeLayerHost v-show="showLayerBox" hostId="testContainer" style="border: 1px solid red; height: 100px; margin: 10px 0">
+            <OfficeLayerHost v-show="showLayerBox" hostId="testContainer"
+                             style="border: 1px solid red; height: 100px; margin: 10px 0">
             </OfficeLayerHost>
 
             <OfficeLayer v-if="showLayerInBox" @click="alert('test')" filterEvents hostId="testContainer">
@@ -139,6 +140,56 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
             </OfficeProgressIndicator>
         </OverviewItem>
 
+        <OverviewItem title="Modal" :options="modalOptions">
+            <template slot-scope="props">
+                <OfficeButton @click="openModal" label="Open Modal"></OfficeButton>
+                <OfficeModal v-bind="props" :isOpen="modalActive" @onDismiss="closeModal">
+                        <h1>Lorem Ipsum</h1>
+                        <OfficeButton @click="closeModal" label="Close Modal"></OfficeButton>
+                        <p>
+                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas lorem nulla, malesuada ut sagittis sit
+                            amet, vulputate in leo. Maecenas vulputate congue sapien eu tincidunt. Etiam eu sem turpis. Fusce tempor
+                            sagittis nunc, ut interdum ipsum vestibulum non. Proin dolor elit, aliquam eget tincidunt non, vestibulum
+                            ut turpis. In hac habitasse platea dictumst. In a odio eget enim porttitor maximus. Aliquam nulla nibh,
+                            ullamcorper aliquam placerat eu, viverra et dui. Phasellus ex lectus, maximus in mollis ac, luctus vel
+                            eros. Vivamus ultrices, turpis sed malesuada gravida, eros ipsum venenatis elit, et volutpat eros dui et
+                            ante. Quisque ultricies mi nec leo ultricies mollis. Vivamus egestas volutpat lacinia. Quisque pharetra
+                            eleifend efficitur.{' '}
+                        </p>
+                        <p>
+                            Mauris at nunc eget lectus lobortis facilisis et eget magna. Vestibulum venenatis augue sapien, rhoncus
+                            faucibus magna semper eget. Proin rutrum libero sagittis sapien aliquet auctor. Suspendisse tristique a
+                            magna at facilisis. Duis rhoncus feugiat magna in rutrum. Suspendisse semper, dolor et vestibulum lacinia,
+                            nunc felis malesuada ex, nec hendrerit justo ex et massa. Quisque quis mollis nulla. Nam commodo est
+                            ornare, rhoncus odio eu, pharetra tellus. Nunc sed velit mi.{' '}
+                        </p>
+                        <p>
+                            Sed condimentum ultricies turpis convallis pharetra. Sed sagittis quam pharetra luctus porttitor. Cras vel
+                            consequat lectus. Sed nec fringilla urna, a aliquet libero. Aenean sed nisl purus. Vivamus vulputate felis
+                            et odio efficitur suscipit. Ut volutpat dictum lectus, ac rutrum massa accumsan at. Sed pharetra auctor
+                            finibus. In augue libero, commodo vitae nisi non, sagittis convallis ante. Phasellus malesuada eleifend
+                            mollis. Curabitur ultricies leo ac metus venenatis elementum.{' '}
+                        </p>
+                        <p>
+                            Aenean egestas quam ut erat commodo blandit. Mauris ante nisl, pellentesque sed venenatis nec, aliquet sit
+                            amet enim. Praesent vitae diam non diam aliquet tristique non ut arcu. Pellentesque et ultrices eros.
+                            Fusce diam metus, mattis eu luctus nec, facilisis vel erat. Nam a lacus quis tellus gravida euismod. Nulla
+                            sed sem eget tortor cursus interdum. Sed vehicula tristique ultricies. Aenean libero purus, mollis quis
+                            massa quis, eleifend dictum massa. Fusce eu sapien sit amet odio lacinia placerat. Mauris varius risus sed
+                            aliquet cursus. Aenean lectus magna, tincidunt sit amet sodales a, volutpat ac leo. Morbi nisl sapien,
+                            tincidunt sit amet mauris quis, sollicitudin auctor est.{' '}
+                        </p>
+                        <p>
+                            Nam id mi justo. Nam vehicula vulputate augue, ac pretium enim rutrum ultricies. Sed aliquet accumsan
+                            varius. Quisque ac auctor ligula. Fusce fringilla, odio et dignissim iaculis, est lacus ultrices risus,
+                            vitae condimentum enim urna eu nunc. In risus est, mattis non suscipit at, mattis ut ante. Maecenas
+                            consectetur urna vel erat maximus, non molestie massa consequat. Duis a feugiat nibh. Sed a hendrerit
+                            diam, a mattis est. In augue dolor, faucibus vel metus at, convallis rhoncus dui.
+                        </p>
+                </OfficeModal>
+            </template>
+        </OverviewItem>
+
         <OfficeLabel style="margin-top: 30px">This is the demo page for
             <OfficeLink href="https://github.com/s-bauer/office-ui-fabric-vue">office-ui-fabric-vue</OfficeLink>
         </OfficeLabel>
@@ -149,10 +200,8 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
     import {Component, Prop, Vue} from "vue-property-decorator";
     import OfficeButton from "../office-ui-fabric-vue/components/Button/OfficeButton.vue";
     import OfficeCheckbox from "../office-ui-fabric-vue/components/Checkbox/OfficeCheckbox.vue";
-
     import OfficeChoiceGroup from "../office-ui-fabric-vue/components/ChoiceGroup/OfficeChoiceGroup.vue";
     import OfficeIcon from "../office-ui-fabric-vue/components/Icon/OfficeIcon.vue";
-
     import {ImageFit} from "../office-ui-fabric-vue/components/Image/OfficeImage.types";
     import OfficeImage from "../office-ui-fabric-vue/components/Image/OfficeImage.vue";
     import OfficeLabel from "../office-ui-fabric-vue/components/Label/OfficeLabel.vue";
@@ -169,8 +218,10 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
     import OfficeToggle from "../office-ui-fabric-vue/components/Toggle/OfficeToggle.vue";
     import FocusTrapZoneExample from "./FocusTrapZoneExample.vue";
     import {ItemTypes} from "./ItemTypes";
-
     import OverviewItem, {IItemOptions} from "./OverviewItem.vue";
+    import OfficeChoiceGroupOption
+        from "../office-ui-fabric-vue/components/ChoiceGroup/ChoiceGroupOption/OfficeChoiceGroupOption.vue";
+    import OfficeModal from "../office-ui-fabric-vue/components/Modal/OfficeModal.vue";
 
     @Component({
         components: {
@@ -180,6 +231,7 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
             OfficeSlider,
             OfficeLink,
             OfficeToggle,
+            OfficeChoiceGroupOption,
             OfficeChoiceGroup,
             OfficeIcon,
             OfficeImage,
@@ -191,6 +243,7 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
             OfficeOverlay,
             OfficeLayerHost,
             OfficeProgressIndicator,
+            OfficeModal
         },
     })
     export default class Overview extends Vue {
@@ -228,9 +281,19 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
             window.alert("clicked!");
         }
 
+        private modalActive = false;
+
+        private openModal() {
+            this.modalActive = true;
+        }
+
+        private closeModal() {
+            this.modalActive = false;
+        }
+
         private mounted() {
             this.interval = window.setInterval(() => {
-                if(this.progressValue > 1)
+                if (this.progressValue > 1)
                     return this.progressValue = 0;
 
                 this.progressValue += 0.01;
@@ -259,6 +322,16 @@ import {SpinnerSize} from "../office-ui-fabric-vue/components/Spinner/OfficeSpin
             };
         }
 
+        get modalOptions(): IItemOptions {
+            return {
+                isDarkOverlay: {type: ItemTypes.BooleanToggle},
+                isBlocking: {type: ItemTypes.BooleanToggle, value: true},
+                topOffsetFixed: {type: ItemTypes.BooleanToggle},
+                forceFocusInsideTrap: {type: ItemTypes.BooleanToggle, value: true},
+                ignoreExternalFocusing: {type: ItemTypes.BooleanToggle},
+            };
+        }
+
         get choiceGroupOptions(): IItemOptions {
             return {
                 disabled: {type: ItemTypes.BooleanToggle},
diff --git a/packages/office-ui-fabric-vue/components/Modal/OfficeModal.style.ts b/packages/office-ui-fabric-vue/components/Modal/OfficeModal.style.ts
new file mode 100644
index 0000000..e131c34
--- /dev/null
+++ b/packages/office-ui-fabric-vue/components/Modal/OfficeModal.style.ts
@@ -0,0 +1,103 @@
+/*
+Taken from https://github.com/OfficeDev/office-ui-fabric-react and slightly modified
+
+License:
+    Office UI Fabric React
+    Copyright (c) Microsoft Corporation
+    All rights reserved.
+    MIT License
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
+*/
+
+import {AnimationVariables} from "@styling/styles";
+import {getGlobalClassNames} from "@styling/styles/getGlobalClassNames";
+import {IOfficeModalStyleProps, IOfficeModalStyles} from "./OfficeModal.types";
+
+export const animationDuration = AnimationVariables.durationValue2;
+
+const globalClassNames = {
+    root: "ms-Modal",
+    main: "ms-Dialog-main",
+    scrollableContent: "ms-Modal-scrollableContent",
+    isOpen: "is-open"
+};
+
+export const getStyles = (props: IOfficeModalStyleProps): IOfficeModalStyles => {
+    const {
+        topOffsetFixed,
+        hasBeenOpened,
+        isOpen,
+        isVisible,
+        modalRectangleTop,
+        scrollableContentClassName,
+        containerClassName,
+        className,
+        theme
+    } = props;
+
+    const {palette} = theme;
+
+    const classNames = getGlobalClassNames(globalClassNames, theme);
+
+
+    return {
+        root: [
+            classNames.root,
+            theme.fonts.medium,
+            {
+                backgroundColor: "transparent",
+                position: "fixed",
+                height: "100%",
+                width: "100%",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                opacity: 0,
+                pointerEvents: "none",
+                transition: `opacity ${animationDuration}`
+            },
+            topOffsetFixed &&
+            hasBeenOpened && {
+                alignItems: "flex-start"
+            },
+            isOpen && classNames.isOpen,
+            isVisible && {
+                opacity: 1,
+                pointerEvents: "auto"
+            },
+            className
+        ],
+        /**
+         *
+         */
+        main: [
+            classNames.main,
+            {
+                boxShadow: "0 0 5px 0 rgba(0, 0, 0, 0.4)",
+                backgroundColor: palette.white,
+                boxSizing: "border-box",
+                position: "relative",
+                textAlign: "left",
+                outline: "3px solid transparent",
+                maxHeight: "100%",
+                overflowY: "auto"
+            },
+            topOffsetFixed &&
+            hasBeenOpened && {
+                top: modalRectangleTop
+            },
+            containerClassName
+        ],
+        scrollableContent: [
+            classNames.scrollableContent,
+            {
+                overflowY: "auto",
+                flexGrow: 1
+            },
+            scrollableContentClassName
+        ]
+    };
+};
diff --git a/packages/office-ui-fabric-vue/components/Modal/OfficeModal.types.ts b/packages/office-ui-fabric-vue/components/Modal/OfficeModal.types.ts
new file mode 100644
index 0000000..8bd2bd7
--- /dev/null
+++ b/packages/office-ui-fabric-vue/components/Modal/OfficeModal.types.ts
@@ -0,0 +1,102 @@
+/*
+Taken from https://github.com/OfficeDev/office-ui-fabric-react and slightly modified
+
+License:
+    Office UI Fabric React
+    Copyright (c) Microsoft Corporation
+    All rights reserved.
+    MIT License
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
+*/
+
+import {IStyle, IStyleFunctionOrObject} from "@uifabric/merge-styles";
+import {ITheme} from "../../../styling";
+import {IOfficeLayerProps} from "@components/Layer/OfficeLayer.types";
+
+export interface IOfficeModalProps {
+    /**
+     * Theme provided by High-Order Component.
+     */
+    theme?: ITheme;
+
+    /**
+     * Whether the dialog is displayed.
+     * @defaultvalue false
+     */
+    isOpen?: boolean;
+
+    /**
+     * Whether the overlay is dark themed.
+     * @defaultvalue true
+     */
+    isDarkOverlay?: boolean;
+    /**
+     * Optional override for root class
+     */
+    className?: string;
+    /**
+     * Optional override for container class
+     */
+    containerClassName?: string;
+
+    /**
+     * Optional override for scrollable content class
+     */
+    scrollableContentClassName?: string;
+
+    /**
+     * A callback function for when the Modal is dismissed light dismiss, before the animation completes.
+     */
+    onDismiss?: () => any;
+
+    /**
+     * Props to be passed through to Layer
+     */
+    layerProps?: IOfficeLayerProps;
+
+    /**
+     * Whether the dialog can be light dismissed by clicking outside the dialog (on the overlay).
+     * @defaultvalue false
+     */
+    isBlocking?: boolean;
+
+    /**
+     * Whether the modal should have top offset fixed once opened and expand from the bottom only
+     * when the content changes dynamically.
+     */
+    topOffsetFixed?: boolean;
+}
+
+export interface IOfficeModalStyleProps {
+    /**
+     * Accept theme prop.
+     */
+    theme: ITheme;
+    topOffsetFixed?: boolean;
+    containerClassName?: string;
+    className?: string;
+
+    /**
+     * Optional override for scrollable content class
+     */
+    scrollableContentClassName?: string;
+    /** Modal open state. */
+    isOpen?: boolean;
+    /** Modal visible state. */
+    isVisible?: boolean;
+    /** Modal has been opened state. */
+    hasBeenOpened?: boolean;
+
+    /** Positioning of modal on first render */
+    modalRectangleTop?: number;
+}
+
+
+export interface IOfficeModalStyles {
+    root: IStyle;
+    main: IStyle;
+    scrollableContent: IStyle;
+}
diff --git a/packages/office-ui-fabric-vue/components/Modal/OfficeModal.vue b/packages/office-ui-fabric-vue/components/Modal/OfficeModal.vue
new file mode 100644
index 0000000..25612ba
--- /dev/null
+++ b/packages/office-ui-fabric-vue/components/Modal/OfficeModal.vue
@@ -0,0 +1,96 @@
+<template>
+    <OfficeLayer ref="self" v-if="state.isOpen && state.isVisible" v-bind="layerProps">
+        <OfficePopup>
+            <div :class="classNames.root">
+                <OfficeOverlay @click.native="emitDismiss()" :visible="state.isOpen" :isDarkThemed="isDarkOverlay"/>
+                <FocusTrapZone
+                        :class="classNames.main"
+                        :elementToFocusOnDismiss="elementToFocusOnDismiss"
+                        :isClickableOutsideFocusTrap="!isBlocking"
+                        :ignoreExternalFocusing="ignoreExternalFocusing"
+                        :forceFocusInsideTrap="forceFocusInsideTrap"
+                        :firstFocusableSelector="firstFocusableSelector"
+                >
+                    <div :class="classNames.scrollableContent">
+                        <slot/>
+                    </div>
+                </FocusTrapZone>
+            </div>
+        </OfficePopup>
+    </OfficeLayer>
+</template>
+
+<script lang="ts">
+    import {Component, Vue, Prop, Emit} from "vue-property-decorator";
+    import {mergeStyleSets} from "@uifabric/merge-styles";
+    import {getStyles} from "./OfficeModal.style";
+    import {createTheme} from "@styling/styles";
+    import {getId} from "@utilities/object";
+    import {IOfficeLayerProps} from "@components/Layer/OfficeLayer.types";
+    import OfficeOverlay from "@components/Overlay/OfficeOverlay.vue";
+    import FocusTrapZone from "@components/FocusTrapZone/FocusTrapZone.vue";
+    import OfficeLayer from "@components/Layer/OfficeLayer.vue";
+    import OfficePopup from "@components/Popup/OfficePopup.vue";
+
+    @Component({
+        components: {OfficePopup, OfficeLayer, OfficeOverlay, FocusTrapZone}
+    })
+    export default class OfficeModal extends Vue {
+        @Prop({type: Boolean, default: false}) private isOpen!: boolean;
+        @Prop({type: Boolean, default: true}) private isDarkOverlay!: boolean;
+        @Prop({type: Boolean, default: true}) private isBlocking!: boolean;
+        @Prop({type: String, default: ""}) private containerClassName!: string;
+        @Prop({type: String, default: ""}) private scrollableContentClassName!: string;
+        @Prop({type: String, default: ""}) private className!: string;
+        @Prop({type: Boolean, default: false}) private topOffsetFixed!: boolean;
+        @Prop({type: Object, default: null}) private layerProps!: IOfficeLayerProps;
+
+        @Prop({type: Object}) private elementToFocusOnDismiss?: HTMLElement;
+        @Prop({type: [String, Function]}) private firstFocusableSelector?: string | (() => string);
+        @Prop({type: Boolean, default: true}) private forceFocusInsideTrap!: boolean;
+        @Prop({type: Boolean, default: false}) private ignoreExternalFocusing!: boolean;
+        @Prop({type: Boolean, default: false}) private isClickableOutsideFocusTrap!: boolean;
+
+
+        public emitDismiss() {
+            if (!this.isBlocking) {
+                this.$emit("onDismiss");
+            }
+        }
+
+        private get state() {
+            let modalRectangleTop: number | undefined;
+            if (this.topOffsetFixed) {
+                const dialogMain = document.getElementsByClassName("ms-Dialog-main");
+                if (dialogMain.length > 0) {
+                    modalRectangleTop = dialogMain[0].getBoundingClientRect().top;
+                }
+            }
+            const root = this.$refs.self as HTMLDivElement;
+            return {
+                id: getId("OfficeModal"),
+                isOpen: this.isOpen,
+                isVisible: root && root.style && root.style.display === "none" ? false : this.isOpen,
+                hasBeenOpened: this.isOpen,
+                modalRectangleTop,
+                topOffsetFixed: this.topOffsetFixed
+            };
+        }
+
+        private get classNames() {
+            return mergeStyleSets(getStyles({
+                isVisible: this.state.isVisible,
+                isOpen: this.state.isOpen,
+                hasBeenOpened: this.state.hasBeenOpened,
+                modalRectangleTop: this.state.modalRectangleTop,
+                topOffsetFixed: this.state.topOffsetFixed,
+                theme: createTheme({}),
+                containerClassName: this.containerClassName,
+                scrollableContentClassName: this.scrollableContentClassName,
+                className: this.className
+            }));
+        }
+
+
+    }
+</script>
diff --git a/packages/office-ui-fabric-vue/components/Overlay/OfficeOverlay.vue b/packages/office-ui-fabric-vue/components/Overlay/OfficeOverlay.vue
index 3f8d910..3e4e398 100644
--- a/packages/office-ui-fabric-vue/components/Overlay/OfficeOverlay.vue
+++ b/packages/office-ui-fabric-vue/components/Overlay/OfficeOverlay.vue
@@ -24,6 +24,10 @@
             overflow: "hidden !important" as "hidden"
         });
 
+        public destroyed() {
+            this.enableBodyScroll();
+        }
+
         public get classNames() {
             return mergeStyleSets(getStyles({
                 isDark: this.isDarkThemed,
@@ -58,5 +62,7 @@
                 doc.body.removeEventListener("touchmove", this.disableIosBodyScroll);
             }
         }
+
+
     }
 </script>
diff --git a/packages/office-ui-fabric-vue/components/Popup/OfficePopup.vue b/packages/office-ui-fabric-vue/components/Popup/OfficePopup.vue
index 319da82..d711045 100644
--- a/packages/office-ui-fabric-vue/components/Popup/OfficePopup.vue
+++ b/packages/office-ui-fabric-vue/components/Popup/OfficePopup.vue
@@ -76,7 +76,7 @@
                 return;
             }
             let needsVerticalScrollBar = false;
-            if (root.firstElementChild) {
+            if (root && root.firstElementChild) {
                 // ClientHeight returns the client height of an element rounded to an
                 // integer. On some browsers at different zoom levels this rounding
                 // can generate different results for the root container and child even