Refactoring
Working tests what!
Refactor hiyoooo
Final refactor