starting refactoring!
Yeah still refactoring!