Imports controller: another attempt at getting this logic right