+1 again. this is beautiful. the next PR is removing TONS of duplicated code.