yet another complete switch up of everything. still completely imperfect.