closer to refactor
solved refactor...way simpler than i though