made exports functional, updated todo