Stable version before making list of currently displaying logs. Mostly refactors in this change