why did I ever think it would be a "small" refactor?!