t693: Architecture overhaul (machete #1)