Major refactor on hold for now