WIP
now deals appropriately with other leftover files