WIP: Overhaul to use goop instead of submodules