further TODO ideas added