more todos and stuff