WIP: First try at wiring it up; tests crashing