Initial Overhaul for 1.7.2