Tentative move code that will probably be moved to main