working on Catam
clean up and try to import everything...