The long overdue "real" version

Timeouts are currently broken, but the fun parts are usable and all the insane
parts are gone.