some TODOS moved to Githib issues