Fixing code and adding everything
All ready
Add all