Major refactor of everything
huge commit
major refactor