Got it working in the simplest case, just needs to be built out