All changes made to be pushed here with proper commit message to make sure we can track changes