All todo's cleared

need to test against Otani tester