Commit 5

Final Commit before launch