* refactoring down, now going to remove "trash"