Note commits containing "DEBUG" will be removed once this is done this MR is based on !12 (merged) and will be rebased on top of main once !12 (merged) lands
Note
main
i think this is best reviewed commit by commit