added TODOs and findPoint for SW & Horn