Major overhaul of many features