more background points and refactoring
forgot to include deleted files