Everything builds, still need to address some todo's

[#73977450]