{WIP} Rework console output