Major overhaul of main design