trying to refactor
success?
finished organizing