lots of todos should've been done a long time ago