Adding additional logging, and comments to app