Multiple changes to integrate new code. Completed AStar service definitions and client in main