Rewrote Module 2 with OOP and File Re-org/cleanup