Working! Big progress on #137