complete overhaul, i3 additions, modularity