Add logger and app-logger blocks and get rid of console calls