more restructuring, i keep getting interrupted...