reworked getting there, still some issues