todo stuff
merged