Boarding done right

[work in progress]