Soft Launch Version

Final commit before soft launch