Sync any missing parts
gitignore
Merge branch 'Refactor' into develop