New layout [THIS BREAKS EVERYTHING]

... but that's okay, since nobody's using it.
I mean - at least it still *compiles*!

"J.A.R.V.I.S. - we're back in hardware mode!"