adding stuff in TODO