WIP: trying to work around the modules problem; no much success