working on moving functions to imports