Did a complete refactor to do it more efficiently