Much cleaner now! Much better with OOD