Cleanup and start to add a* strategy