Restructure -- readd i3 \\o/