21st July Commits -  Many changes

Many changes