Committing back all the code for full review