more todo
more todos and better namings
naming improvings