Still not working but closer to the goal