Got Astar merged and working