Finished commenting the Backend
Merge origin/master