import from filesystem
adding css images for theme
cleanup and race condition hack
added dump calculation
conflict resolution