Design overhaul part 1