[Jimmy] Files prepared for angularization.
Add a few comments
Add a few comments and merge the file