Worked a bit more of the AStar class