Most functionality now working with modules