Post-OO Refactor + Daylight Fix