Major refactor
major refactor
major refactor