great refactor of everything