updated todo to reflect popping things into their own package