diff --git a/src/app/problems/problem/problem.module.ts b/src/app/problems/problem/problem.module.ts
index 2125ba9..4a9c064 100644
--- a/src/app/problems/problem/problem.module.ts
+++ b/src/app/problems/problem/problem.module.ts
@@ -14,6 +14,7 @@ import { RankingComponent } from './leaderboard/ranking';
 import { SharingService } from './shared';
 import { FormattingModule } from '../../shared';
 import { CodeEditorModule } from '../../code-editor';
+import { SubmissionModule } from '../../submission-modal';
 
 @NgModule({
   imports: [
@@ -24,6 +25,7 @@ import { CodeEditorModule } from '../../code-editor';
 
     FormattingModule,
     CodeEditorModule,
+    SubmissionModule,
     problemRouting
   ],
   declarations: [
diff --git a/src/app/shared/services/index.ts b/src/app/shared/services/index.ts
index 8afdb05..41421ff 100644
--- a/src/app/shared/services/index.ts
+++ b/src/app/shared/services/index.ts
@@ -1,2 +1 @@
 export * from './login-modal.service';
-export * from './submission.service';
diff --git a/src/app/shared/services/submission.service.ts b/src/app/shared/services/submission.service.ts
deleted file mode 100644
index e28be5b..0000000
--- a/src/app/shared/services/submission.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Http, Headers } from '@angular/http';
-import { Observable } from 'rxjs';
-import { Result, Submission } from '../';
-
-const Url = 'http://code.neumont.edu/submit';
-const RequestHeaders = new Headers({
-  'Content-Type': 'application/json'
-});
-
-@Injectable()
-export class SubmissionService {
-  constructor(private http: Http) {}
-
-  submit(submission: Submission): Observable<Result> {
-    return this.http
-      .post(Url, submission, {headers: RequestHeaders})
-      .map(res => res.json() as Result);
-  }
-}
diff --git a/src/app/submission-modal/index.ts b/src/app/submission-modal/index.ts
index e8748c7..e698a40 100644
--- a/src/app/submission-modal/index.ts
+++ b/src/app/submission-modal/index.ts
@@ -1,2 +1,2 @@
 export * from './submission-modal.component';
-export * from './submission-modal.module';
+export * from './submission.module';
diff --git a/src/app/submission-modal/submission-modal.component.html b/src/app/submission-modal/submission-modal.component.html
index 7c3c523..1ae9e97 100644
--- a/src/app/submission-modal/submission-modal.component.html
+++ b/src/app/submission-modal/submission-modal.component.html
@@ -1,5 +1,8 @@
+<!--TODO: once fixed-->
+<!--[config]="{backdrop: 'static'}"-->
+
 <div bsModal #modal="bs-modal" class="modal fade"
-    [config]="{backdrop: 'static'}" tabindex="-1"
+    [config]="{backdrop: false}" tabindex="-1"
     (onHide)="onHide()"
     role="dialog" aria-labelledby="modal" aria-hidden="true">
   <div class="vertical-alignment-helper">
diff --git a/src/app/submission-modal/submission-modal.component.ts b/src/app/submission-modal/submission-modal.component.ts
index b4c7d0b..939b5e1 100644
--- a/src/app/submission-modal/submission-modal.component.ts
+++ b/src/app/submission-modal/submission-modal.component.ts
@@ -3,18 +3,17 @@ import { Component, Input, OnDestroy, ViewChild } from '@angular/core';
 import { Subscription } from 'rxjs/Rx';
 import { ModalDirective, ModalOptions } from 'ng2-bootstrap';
 
-import { AuthService, Result, Submission, SubmissionService } from '../shared';
+import { AuthService, Result, Submission } from '../shared';
+import { SubmissionService } from './submission.service';
 
-const configPreventCloseOnClickOutside: ModalOptions = { backdrop: 'static' };
+const configPreventCloseOnClickOutside: ModalOptions = {  }; // backdrop: 'static'
+const configAllowCloseOnClickOutside: ModalOptions = {};
 
 @Component({
   moduleId: module.id,
   selector: 'app-submission-modal',
   templateUrl: 'submission-modal.component.html',
-  styleUrls: ['submission-modal.component.css'],
-  providers: [
-    SubmissionService
-  ]
+  styleUrls: ['submission-modal.component.css']
 })
 export class SubmissionModalComponent implements OnDestroy {
   @Input() problemId: string;
@@ -56,9 +55,11 @@ export class SubmissionModalComponent implements OnDestroy {
           },
           () => {
             // Allow click outside
-            this.modal.config = {};
+            this.modal.config = configAllowCloseOnClickOutside;
             this.killSubscription();
           });
+          console.log('before');
+
       this.modal.show();
     });
   }
diff --git a/src/app/submission-modal/submission-modal.module.ts b/src/app/submission-modal/submission.module.ts
similarity index 55%
rename from src/app/submission-modal/submission-modal.module.ts
rename to src/app/submission-modal/submission.module.ts
index dbae1e0..95f592c 100644
--- a/src/app/submission-modal/submission-modal.module.ts
+++ b/src/app/submission-modal/submission.module.ts
@@ -1,21 +1,24 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
+import { HttpModule } from '@angular/http';
 
 import { ModalModule } from 'ng2-bootstrap';
 
 import { SubmissionModalComponent } from './submission-modal.component';
+import { SubmissionService } from './submission.service';
+import { FormattingModule } from '../shared';
 
 @NgModule({
   imports: [
     CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    RouterModule,
-    ModalModule
+    HttpModule,
+
+    ModalModule,
+
+    FormattingModule
   ],
   declarations: [SubmissionModalComponent],
+  providers: [SubmissionService],
   exports: [SubmissionModalComponent]
 })
-export class SubmissionModalModule { }
+export class SubmissionModule { }
diff --git a/src/app/submission-modal/submission.service.ts b/src/app/submission-modal/submission.service.ts
new file mode 100644
index 0000000..7245430
--- /dev/null
+++ b/src/app/submission-modal/submission.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { Http, Headers } from '@angular/http';
+
+import { Observable } from 'rxjs/Rx';
+
+import { Result, Submission } from '../shared';
+
+const url = 'http://code.neumont.edu/submit';
+const requestHeaders = new Headers({ 'Content-Type': 'application/json' });
+
+@Injectable()
+export class SubmissionService {
+  constructor(private http: Http) { }
+
+  submit(submission: Submission): Observable<Result> {
+    return this.http
+        .post(url, submission, {headers: requestHeaders})
+        .map(res => res.json() as Result);
+  }
+}