Intermeditary multi-level support commit. At this point, resolving
conflicts would be extraordinarily annoying. Names shuffled around.