Final Committ

Everything is done and ready to make live!